Merge null coalescing

edwardneal · edwardneal · commit a838928b68d5 · 2025-03-16T23:58:10.000Z
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -2452,7 +2452,7 @@ internal TdsOperationStatus TryRun(RunBehavior runBehavior, SqlCommand cmdHandle
                             {
                                 _SqlMetaDataSet metadata;
                                 result = TryProcessMetaData(tokenLength, stateObj, out metadata,
-                                                        cmdHandler != null ? cmdHandler.ColumnEncryptionSetting : SqlCommandColumnEncryptionSetting.UseConnectionSetting);
+                                                        cmdHandler?.ColumnEncryptionSetting ?? SqlCommandColumnEncryptionSetting.UseConnectionSetting);
                                 if (result != TdsOperationStatus.Done)
                                 {
                                     return result;
@@ -2587,7 +2587,7 @@ internal TdsOperationStatus TryRun(RunBehavior runBehavior, SqlCommand cmdHandle
                         {
                             SqlReturnValue returnValue;
                             result = TryProcessReturnValue(tokenLength, stateObj, out returnValue,
-                                                       cmdHandler != null ? cmdHandler.ColumnEncryptionSetting : SqlCommandColumnEncryptionSetting.UseConnectionSetting);
+                                                       cmdHandler?.ColumnEncryptionSetting ?? SqlCommandColumnEncryptionSetting.UseConnectionSetting);
                             if (result != TdsOperationStatus.Done)
                             {
                                 return result;

Original file line number	Diff line number	Diff line change
`@@ -2452,7 +2452,7 @@ internal TdsOperationStatus TryRun(RunBehavior runBehavior, SqlCommand cmdHandle`
`2452`	`2452`	`{`
`2453`	`2453`	`_SqlMetaDataSet metadata;`
`2454`	`2454`	`result = TryProcessMetaData(tokenLength, stateObj, out metadata,`
`2455`		`- cmdHandler != null ? cmdHandler.ColumnEncryptionSetting : SqlCommandColumnEncryptionSetting.UseConnectionSetting);`
	`2455`	`+ cmdHandler?.ColumnEncryptionSetting ?? SqlCommandColumnEncryptionSetting.UseConnectionSetting);`
`2456`	`2456`	`if (result != TdsOperationStatus.Done)`
`2457`	`2457`	`{`
`2458`	`2458`	`return result;`
`@@ -2587,7 +2587,7 @@ internal TdsOperationStatus TryRun(RunBehavior runBehavior, SqlCommand cmdHandle`
`2587`	`2587`	`{`
`2588`	`2588`	`SqlReturnValue returnValue;`
`2589`	`2589`	`result = TryProcessReturnValue(tokenLength, stateObj, out returnValue,`
`2590`		`- cmdHandler != null ? cmdHandler.ColumnEncryptionSetting : SqlCommandColumnEncryptionSetting.UseConnectionSetting);`
	`2590`	`+ cmdHandler?.ColumnEncryptionSetting ?? SqlCommandColumnEncryptionSetting.UseConnectionSetting);`
`2591`	`2591`	`if (result != TdsOperationStatus.Done)`
`2592`	`2592`	`{`
`2593`	`2593`	`return result;`