For failed connection requests in ConnectionPool in case of PoolBlock…

…ingPeriod not enabled, ensure stacktrace of the exception is not swallowed (#1768)
dotnet · Sep 27, 2022 · f62ac3b · f62ac3b
1 parent 50ec923
commit f62ac3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/...oft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.NetCoreApp.cs b/...oft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.NetCoreApp.cs
@@ -11,14 +11,6 @@ namespace Microsoft.Data.ProviderBase
 {
     sealed internal partial class DbConnectionPool
     {
-        partial void CheckPoolBlockingPeriod(Exception e)
-        {
-            if (!IsBlockingPeriodEnabled())
-            {
-                throw e;
-            }
-        }
-
         private bool IsBlockingPeriodEnabled()
         {
             var poolGroupConnectionOptions = _connectionPoolGroup.ConnectionOptions as SqlConnectionString;

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
@@ -776,7 +776,12 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
                     throw;
                 }
 
-                CheckPoolBlockingPeriod(e);
+#if NETCOREAPP
+                if (!IsBlockingPeriodEnabled())
+                {
+                    throw;
+                }
+#endif
 
                 // Close associated Parser if connection already established.
                 if (newObj?.IsConnectionAlive() == true)
@@ -824,9 +829,6 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
             return newObj;
         }
 
-        //This method is implemented in DbConnectionPool.NetCoreApp 
-        partial void CheckPoolBlockingPeriod(Exception e);
-
         private void DeactivateObject(DbConnectionInternal obj)
         {
             SqlClientEventSource.Log.TryPoolerTraceEvent("<prov.DbConnectionPool.DeactivateObject|RES|CPOOL> {0}, Connection {1}, Deactivating.", ObjectID, obj.ObjectID);