Fixed potential bug, added comments (#302)

DarkWanderer · May 3, 2023 · a635e8e · a635e8e
1 parent 961c83b
commit a635e8e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/ClickHouse.Client/ADO/ClickHouseConnection.cs b/ClickHouse.Client/ADO/ClickHouseConnection.cs
@@ -193,25 +193,34 @@ public virtual Feature SupportedFeatures
 
     private void ResetHttpClientFactory()
     {
-        if (httpClientFactory is IDisposable disposable)
+        // If current httpClientFactory is owned by this connection, dispose of it
+        if (httpClientFactory is IDisposable d && disposables.Contains(d))
         {
-            disposable.Dispose();
-            disposables.Remove(disposable);
+            d.Dispose();
+            disposables.Remove(d);
         }
+
+        // If we have a HttpClient provided, use it
         if (providedHttpClient != null)
         {
             httpClientFactory = new CannedHttpClientFactory(providedHttpClient);
         }
+
+        // If we have a provided client factory, use that
         else if (providedHttpClientFactory != null)
         {
             httpClientFactory = providedHttpClientFactory;
         }
+
+        // If sessions are enabled, always use single connection
         else if (!string.IsNullOrEmpty(session))
         {
             var factory = new SingleConnectionHttpClientFactory() { Timeout = timeout };
             disposables.Add(factory);
             httpClientFactory = factory;
         }
+
+        // Default case - use default connection pool
         else
         {
             httpClientFactory = new DefaultPoolHttpClientFactory() { Timeout = timeout };