Additional null checks

dotnet · Jan 26, 2021 · c881b91 · c881b91
1 parent 4586cf0
commit c881b91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs
@@ -772,13 +772,13 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
 
                 CheckPoolBlockingPeriod(e);
 
-                // Close Parser if connection already established.
-                if (newObj.IsConnectionAlive())
+                // Close associated Parser if connection already established.
+                if (newObj != null && newObj.IsConnectionAlive())
                 {
                     newObj.Dispose();
+                    newObj = null; // set to null, so we do not return bad new object
                 }
 
-                newObj = null; // set to null, so we do not return bad new object
                 // Failed to create instance
                 _resError = e;
 

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs
@@ -907,12 +907,12 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
                 }
 
                 // Close associated Parser if connection already established.
-                if (newObj.IsConnectionAlive())
+                if (newObj != null && newObj.IsConnectionAlive())
                 {
                     newObj.Dispose();
+                    newObj = null; // set to null, so we do not return bad new object
                 }
 
-                newObj = null; // set to null, so we do not return bad new object
                 // Failed to create instance
                 _resError = e;