Broken connections do not go back to the pool (DNET-818).

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs

@@ -122,6 +122,10 @@ public byte[] AuthData
 			get { return _connection.AuthData; }
 		}
 
+		public bool ConnectionBroken
+		{
+			get { return _xdrStream.IOFailed; }
+		}
 
 		#endregion
 

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/XdrStream.cs

@@ -85,6 +85,7 @@ private static byte[] Pad
 		private Ionic.Zlib.ZlibCodec _inflate;
 		private byte[] _compressionBuffer;
 
+		private bool _ioFailed;
 		private int _operation;
 
 		#endregion
@@ -119,6 +120,15 @@ public override long Length
 
 		#endregion
 
+		#region Properties
+
+		public bool IOFailed
+		{
+			get { return _ioFailed; }
+		}
+
+		#endregion
+
 		#region Constructors
 
 		public XdrStream()
@@ -151,6 +161,7 @@ public XdrStream(Stream innerStream, Charset charset, bool compression, bool own
 				_compressionBuffer = new byte[1024 * 1024];
 			}
 
+			_ioFailed = false;
 			ResetOperation();
 		}
 
@@ -194,8 +205,16 @@ public override void Flush()
 				buffer = _compressionBuffer;
 				count = _deflate.NextOut;
 			}
-			_innerStream.Write(buffer, 0, count);
-			_innerStream.Flush();
+			try
+			{
+				_innerStream.Write(buffer, 0, count);
+				_innerStream.Flush();
+			}
+			catch (IOException)
+			{
+				_ioFailed = true;
+				throw;
+			}
 		}
 
 		public override void SetLength(long length)
@@ -228,7 +247,16 @@ public override int Read(byte[] buffer, int offset, int count)
 			if (_inputBuffer.Length < count)
 			{
 				var readBuffer = new byte[PreferredBufferSize];
-				var read = _innerStream.Read(readBuffer, 0, readBuffer.Length);
+				var read = default(int);
+				try
+				{
+					read = _innerStream.Read(readBuffer, 0, readBuffer.Length);
+				}
+				catch (IOException)
+				{
+					_ioFailed = true;
+					throw;
+				}
 				if (read != 0)
 				{
 					if (_compression)
@@ -262,7 +290,16 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
 			if (_inputBuffer.Length < count)
 			{
 				var readBuffer = new byte[PreferredBufferSize];
-				var read = await _innerStream.ReadAsync(readBuffer, 0, readBuffer.Length).ConfigureAwait(false);
+				var read = default(int);
+				try
+				{
+					read = await _innerStream.ReadAsync(readBuffer, 0, readBuffer.Length).ConfigureAwait(false);
+				}
+				catch (IOException)
+				{
+					_ioFailed = true;
+					throw;
+				}
 				if (read != 0)
 				{
 					if (_compression)
@@ -309,7 +346,7 @@ public byte[] ToArray()
 		{
 			CheckDisposed();
 
-			if(!(_innerStream is MemoryStream memoryStream))
+			if (!(_innerStream is MemoryStream memoryStream))
 				throw new InvalidOperationException();
 			Flush();
 			return memoryStream.ToArray();

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs

@@ -105,6 +105,11 @@ public IFbClient FbClient
 			get { return _fbClient; }
 		}
 
+		public bool ConnectionBroken
+		{
+			get { return false; }
+		}
+
 		#endregion
 
 		#region Constructors

Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs

@@ -32,6 +32,7 @@ internal interface IDatabase : IDisposable
 		short PacketSize { get; set; }
 		short Dialect { get; set; }
 		bool HasRemoteEventSupport { get; }
+		bool ConnectionBroken { get; }
 
 		void Attach(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey);
 		void AttachWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey);

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

@@ -523,7 +523,18 @@ public override void Close()
 							_innerConnection.EnableCancel();
 						}
 
-						FbConnectionPoolManager.Instance.Release(_innerConnection);
+						if (!_innerConnection.Database.ConnectionBroken)
+						{
+							FbConnectionPoolManager.Instance.Release(_innerConnection);
+						}
+						else
+						{
+							if (!_innerConnection.IsEnlisted)
+							{
+								_innerConnection.Dispose();
+							}
+							_innerConnection = null;
+						}
 					}
 					else
 					{