Fix hang when disposing MySqlDataSource twice on .NET Framework.

mysql-net · Jan 12, 2024 · 2f95bb2 · 2f95bb2
1 parent ebcf3cf
commit 2f95bb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/MySqlConnector/Core/ConnectionPool.cs b/src/MySqlConnector/Core/ConnectionPool.cs
@@ -250,12 +250,14 @@ public void Dispose()
 			using var dnsCheckWaitHandle = new ManualResetEvent(false);
 			m_dnsCheckTimer.Dispose(dnsCheckWaitHandle);
 			dnsCheckWaitHandle.WaitOne();
+			m_dnsCheckTimer = null;
 		}
 		if (m_reaperTimer is not null)
 		{
 			using var reaperWaitHandle = new ManualResetEvent(false);
 			m_reaperTimer.Dispose(reaperWaitHandle);
 			reaperWaitHandle.WaitOne();
+			m_reaperTimer = null;
 		}
 #endif
 	}

diff --git a/tests/IntegrationTests/MySqlDataSourceTests.cs b/tests/IntegrationTests/MySqlDataSourceTests.cs
@@ -25,6 +25,17 @@ public void OpenConnection()
 		Assert.Equal(ConnectionState.Open, connection.State);
 	}
 
+    [Fact]
+    public void DoubleDispose()
+    {
+        using var dbSource = new MySqlDataSource(AppConfig.ConnectionString);
+		using (var connection = dbSource.OpenConnection())
+		{
+            Assert.Equal(ConnectionState.Open, connection.State);
+        }
+		dbSource.Dispose();
+    }
+
 	[Fact]
 	public async Task OpenConnectionAsync()
 	{