Fixing null set issue in SqlDataReader?

benrr101 · benrr101 · commit 40d3fb72d355 · 2025-12-10T18:02:36.000-06:00
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -5875,7 +5875,7 @@ private void CleanupAfterAsyncInvocationInternal(TdsParserStateObject stateObj,
             stateObj._permitReplayStackTraceToDiffer = false;
 #endif
 
-            if (_connection?.InnerConnection is SqlConnectionInternal sqlInternalConnection)
+            if (_snapshot is not null && _connection?.InnerConnection is SqlConnectionInternal sqlInternalConnection)
             {
                 sqlInternalConnection.CachedContexts.TrySetDataReaderSnapshot(_snapshot);
             }

Original file line number	Diff line number	Diff line change
`@@ -5875,7 +5875,7 @@ private void CleanupAfterAsyncInvocationInternal(TdsParserStateObject stateObj,`
`5875`	`5875`	`stateObj._permitReplayStackTraceToDiffer = false;`
`5876`	`5876`	`#endif`
`5877`	`5877`
`5878`		`- if (_connection?.InnerConnection is SqlConnectionInternal sqlInternalConnection)`
	`5878`	`+ if (_snapshot is not null && _connection?.InnerConnection is SqlConnectionInternal sqlInternalConnection)`
`5879`	`5879`	`{`
`5880`	`5880`	`sqlInternalConnection.CachedContexts.TrySetDataReaderSnapshot(_snapshot);`
`5881`	`5881`	`}`