Merge pull request #26609 from dotnet-maestro-bot/merge/release/6.0-t…

…o-main [automated] Merge branch 'release/6.0' => 'main'
dotnet · Nov 10, 2021 · 6286284 · 6286284
2 parents 846070d + 6ae128a
commit 6286284
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteConnectionFactory.cs b/src/Microsoft.Data.Sqlite.Core/SqliteConnectionFactory.cs
@@ -20,7 +20,15 @@ internal class SqliteConnectionFactory
         private Dictionary<string, SqliteConnectionPoolGroup> _poolGroups = new();
 
         protected SqliteConnectionFactory()
-            => _pruneTimer = new Timer(PruneCallback, null, TimeSpan.FromMinutes(4), TimeSpan.FromSeconds(30));
+        {
+            if (!AppContext.TryGetSwitch("Microsoft.Data.Sqlite.Issue26422", out var enabled) || !enabled)
+            {
+                AppDomain.CurrentDomain.DomainUnload += (_, _) => ClearPools();
+                AppDomain.CurrentDomain.ProcessExit += (_, _) => ClearPools();
+            }
+
+            _pruneTimer = new Timer(PruneCallback, null, TimeSpan.FromMinutes(4), TimeSpan.FromSeconds(30));
+        }
 
         public SqliteConnectionInternal GetConnection(SqliteConnection outerConnection)
         {