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

benaadams · stephentoub · commit 48525389b9e8 · 2018-01-30T20:22:22.000-05:00
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">

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,11 @@ internal virtual DbConnectionPoolGroupProviderInfo CreateConnectionPoolGroupProv`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`private Timer CreatePruningTimer()`
`124`		`- {`
`125`		`- TimerCallback callback = new TimerCallback(PruneConnectionPoolGroups);`
`126`		`- return new Timer(callback, null, PruningDueTime, PruningPeriod);`
`127`		`- }`
	`124`	`+ => ADP.UnsafeCreateTimer(`
	`125`	`+ new TimerCallback(PruneConnectionPoolGroups),`
	`126`	`+ null,`
	`127`	`+ PruningDueTime,`
	`128`	`+ PruningPeriod);`
`128`	`129`
`129`	`130`	`protected DbConnectionOptions FindConnectionOptions(DbConnectionPoolKey key)`
`130`	`131`	`{`
Original file line number	Diff line number	Diff line change
`@@ -382,9 +382,11 @@ internal void Clear()`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`private Timer CreateCleanupTimer()`
`385`		`- {`
`386`		`- return (new Timer(new TimerCallback(this.CleanupCallback), null, _cleanupWait, _cleanupWait));`
`387`		`- }`
	`385`	`+ => ADP.UnsafeCreateTimer(`
	`386`	`+ new TimerCallback(CleanupCallback),`
	`387`	`+ null,`
	`388`	`+ _cleanupWait,`
	`389`	`+ _cleanupWait);`
`388`	`390`
`389`	`391`	`private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)`
`390`	`392`	`{`