Merge pull request #222 from caleblloyd/f_session_connected

Check Session State when Disposing Connection.

Author: bgrainger

src/MySqlConnector/MySqlClient/ConnectionPool.cs

@@ -58,7 +58,7 @@ public void Return(MySqlSession session)
 		{
 			try
 			{
-				if (session.PoolGeneration == m_generation && session.DatabaseOverride == null)
+				if (session.IsConnected && session.PoolGeneration == m_generation && session.DatabaseOverride == null)
 					m_sessions.Enqueue(session);
 				else
 					session.DisposeAsync(IOBehavior.Synchronous, CancellationToken.None).ConfigureAwait(false);

src/MySqlConnector/MySqlClient/MySqlConnection.cs

@@ -295,16 +295,22 @@ private void DoClose()
 		{
 			if (m_connectionState != ConnectionState.Closed)
 			{
-				CloseDatabase();
-				if (m_session != null)
+				try
 				{
-					if (m_connectionSettings.Pooling)
-						m_session.ReturnToPool();
-					else
-						m_session.DisposeAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
-					m_session = null;
+					CloseDatabase();
+				}
+				finally
+				{
+					if (m_session != null)
+					{
+						if (m_connectionSettings.Pooling)
+							m_session.ReturnToPool();
+						else
+							m_session.DisposeAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+						m_session = null;
+					}
+					SetState(ConnectionState.Closed);
 				}
-				SetState(ConnectionState.Closed);
 			}
 		}
 
@@ -316,7 +322,7 @@ private void CloseDatabase()
 				ActiveReader.Dispose();
 				ActiveReader = null;
 			}
-			if (CurrentTransaction != null)
+			if (CurrentTransaction != null && m_session.IsConnected)
 			{
 				CurrentTransaction.Dispose();
 				CurrentTransaction = null;

src/MySqlConnector/Serialization/MySqlSession.cs

@@ -36,6 +36,8 @@ public MySqlSession(ConnectionPool pool, int poolGeneration)
 
 		public void ReturnToPool() => Pool?.Return(this);
 
+		public bool IsConnected => m_state == State.Connected;
+
 		public async Task DisposeAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
 		{
 			if (m_payloadHandler != null)

tests/SideBySide/DataTypes.cs

@@ -519,6 +519,7 @@ public async Task InsertLargeBlobAsync(string column, int size)
 			using (var connection = new MySqlConnection(AppConfig.CreateConnectionStringBuilder().ConnectionString))
 			{
 				await connection.OpenAsync();
+				var transaction = await connection.BeginTransactionAsync();
 
 				// verify that this amount of data can be sent to MySQL successfully
 				var maxAllowedPacket = (await connection.QueryAsync<int>("select @@max_allowed_packet").ConfigureAwait(false)).Single();
@@ -527,7 +528,7 @@ public async Task InsertLargeBlobAsync(string column, int size)
 				var data = CreateByteArray(size);
 
 				long lastInsertId;
-				using (var cmd = new MySqlCommand(Invariant($"insert into datatypes_blobs(`{column}`) values(?)"), connection)
+				using (var cmd = new MySqlCommand(Invariant($"insert into datatypes_blobs(`{column}`) values(?)"), connection, transaction)
 				{
 					Parameters = { new MySqlParameter { Value = data } }
 				})
@@ -567,6 +568,7 @@ public void InsertLargeBlobSync(string column, int size)
 			using (var connection = new MySqlConnection(AppConfig.CreateConnectionStringBuilder().ConnectionString))
 			{
 				connection.Open();
+				var transaction = connection.BeginTransaction();
 
 				// verify that this amount of data can be sent to MySQL successfully
 				var maxAllowedPacket = m_database.Connection.Query<int>("select @@max_allowed_packet").Single();
@@ -575,7 +577,7 @@ public void InsertLargeBlobSync(string column, int size)
 				var data = CreateByteArray(size);
 
 				long lastInsertId;
-				using (var cmd = new MySqlCommand(Invariant($"insert into datatypes_blobs(`{column}`) values(?)"), connection)
+				using (var cmd = new MySqlCommand(Invariant($"insert into datatypes_blobs(`{column}`) values(?)"), connection, transaction)
 				{
 					Parameters = { new MySqlParameter { Value = data } }
 				})