Busy list in pool handling in case of an error (DNET-916). (#91)

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnection.cs

@@ -457,7 +457,7 @@ public override void Open()
 
 						if (_options.Pooling)
 						{
-							FbConnectionPoolManager.Instance.Release(_innerConnection);
+							FbConnectionPoolManager.Instance.Release(_innerConnection, true);
 						}
 						else
 						{
@@ -511,26 +511,16 @@ public override void Close()
 							_innerConnection.EnableCancel();
 						}
 
-						if (!_innerConnection.Database.ConnectionBroken)
+						var broken = _innerConnection.Database.ConnectionBroken;
+						FbConnectionPoolManager.Instance.Release(_innerConnection, !broken);
+						if (broken)
 						{
-							FbConnectionPoolManager.Instance.Release(_innerConnection);
-						}
-						else
-						{
-							if (!_innerConnection.IsEnlisted)
-							{
-								_innerConnection.Dispose();
-							}
-							_innerConnection = null;
+							EnlistedHelper();
 						}
 					}
 					else
 					{
-						if (!_innerConnection.IsEnlisted)
-						{
-							_innerConnection.Dispose();
-						}
-						_innerConnection = null;
+						EnlistedHelper();
 					}
 				}
 				catch
@@ -540,6 +530,15 @@ public override void Close()
 					OnStateChange(_state, ConnectionState.Closed);
 				}
 			}
+
+			void EnlistedHelper()
+			{
+				if (!_innerConnection.IsEnlisted)
+				{
+					_innerConnection.Dispose();
+				}
+				_innerConnection = null;
+			}
 		}
 
 		#endregion

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionPoolManager.cs

@@ -92,14 +92,14 @@ public FbConnectionInternal GetConnection(FbConnection owner)
 				}
 			}
 
-			public void ReleaseConnection(FbConnectionInternal connection)
+			public void ReleaseConnection(FbConnectionInternal connection, bool returnToAvailable)
 			{
 				lock (_syncRoot)
 				{
 					CheckDisposedImpl();
 
 					var removed = _busy.Remove(connection);
-					if (removed)
+					if (removed && returnToAvailable)
 					{
 						_available.Push(new Item(GetTicks(), connection));
 					}
@@ -196,11 +196,11 @@ internal FbConnectionInternal Get(ConnectionString connectionString, FbConnectio
 			return _pools.GetOrAdd(connectionString.NormalizedConnectionString, _ => new Pool(connectionString)).GetConnection(owner);
 		}
 
-		internal void Release(FbConnectionInternal connection)
+		internal void Release(FbConnectionInternal connection, bool returnToAvailable)
 		{
 			CheckDisposed();
 
-			_pools.GetOrAdd(connection.Options.NormalizedConnectionString, _ => new Pool(connection.Options)).ReleaseConnection(connection);
+			_pools.GetOrAdd(connection.Options.NormalizedConnectionString, _ => new Pool(connection.Options)).ReleaseConnection(connection, returnToAvailable);
 		}
 
 		internal void ClearAllPools()