Don't capture AsyncLocals into ODBC Global Timers (#26066)

dotnet · Jan 31, 2018 · 4852538 · 4852538
1 parent ec353e2
commit 4852538
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionFactory.cs b/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionFactory.cs
@@ -121,10 +121,11 @@ internal virtual DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProv
         }
 
         private Timer CreatePruningTimer()
-        {
-            TimerCallback callback = new TimerCallback(PruneConnectionPoolGroups);
-            return new Timer(callback, null, PruningDueTime, PruningPeriod);
-        }
+            => ADP.UnsafeCreateTimer(
+                new TimerCallback(PruneConnectionPoolGroups),
+                null,
+                PruningDueTime,
+                PruningPeriod);
 
         protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key)
         {

diff --git a/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPool.cs b/src/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbConnectionPool.cs
@@ -382,9 +382,11 @@ internal void Clear()
         }
 
         private Timer CreateCleanupTimer()
-        {
-            return (new Timer(new TimerCallback(this.CleanupCallback), null, _cleanupWait, _cleanupWait));
-        }
+            => ADP.UnsafeCreateTimer(
+                new TimerCallback(CleanupCallback),
+                null,
+                _cleanupWait,
+                _cleanupWait);
 
         private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
         {

diff --git a/src/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/System.Data.Odbc/src/System.Data.Odbc.csproj
@@ -32,6 +32,9 @@
     <Compile Include="$(CommonPath)\System\Data\Common\AdapterUtil.cs">
       <Link>Common\System\Data\Common\AdapterUtil.cs</Link>
     </Compile>
+    <Compile Include="$(CommonPath)\System\Data\Common\AdapterUtil.Drivers.cs">
+      <Link>System\Data\Common\AdapterUtil.Drivers.cs</Link>
+    </Compile>
     <Compile Include="Common\System\Data\Common\AdapterUtil.Odbc.cs" />
     <Compile Include="Common\System\Data\Common\DbConnectionOptions.cs" />
     <Compile Include="$(CommonPath)\System\Data\Common\DbConnectionOptions.Common.cs">