SNOW-957736: Fix SnowflakeDbConnection.Dispose behaviour (#807)

snowflakedb · Nov 9, 2023 · 22d32dd · 22d32dd
1 parent 7f73791
commit 22d32dd
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/Snowflake.Data/Client/SnowflakeDbConnection.cs b/Snowflake.Data/Client/SnowflakeDbConnection.cs
@@ -26,7 +26,7 @@ public class SnowflakeDbConnection : DbConnection
 
         internal int _connectionTimeout;
 
-        private bool disposed = false;
+        private bool _disposed = false;
 
         private static Mutex _arraybindingMutex = new Mutex();
 
@@ -361,21 +361,30 @@ protected override DbCommand CreateDbCommand()
 
         protected override void Dispose(bool disposing)
         {
-            if (disposed)
-                return;
-
-            try
-            {
-                this.Close();
-            } 
-            catch (Exception ex)
+            if (!_disposed)
             {
-                // Prevent an exception from being thrown when disposing of this object
-                logger.Error("Unable to close connection", ex);
+                if (disposing)
+                {
+                    try
+                    {
+                        Close();
+                    }
+                    catch (Exception ex)
+                    {
+                        // Prevent an exception from being thrown when disposing of this object
+                        logger.Error("Unable to close connection", ex);
+                    }
+                }
+                else
+                {
+                    SfSession?.close();
+                    SfSession = null;
+                    _connectionState = ConnectionState.Closed;
+                }
+
+                _disposed = true;
             }
 
-            disposed = true;
-
             base.Dispose(disposing);
         }