Refactoring.

Author: cincuranet

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

@@ -132,7 +132,7 @@ public void Connect()
 
 		public void Identify(string database)
 		{
-			using (var xdrStream = CreateXdrStream(false))
+			using (var xdrStream = CreateXdrStreamImpl(false))
 			{
 				try
 				{
@@ -235,7 +235,7 @@ public void Identify(string database)
 
 		public XdrStream CreateXdrStream()
 		{
-			return CreateXdrStream(_compression);
+			return CreateXdrStreamImpl(_compression);
 		}
 
 		public void Disconnect()
@@ -252,9 +252,7 @@ public void Disconnect()
 
 		private IPAddress GetIPAddress(string dataSource, AddressFamily addressFamily)
 		{
-			IPAddress ipaddress = null;
-
-			if (IPAddress.TryParse(dataSource, out ipaddress))
+			if (IPAddress.TryParse(dataSource, out var ipaddress))
 			{
 				return ipaddress;
 			}
@@ -339,7 +337,7 @@ private byte[] UserIdentificationData()
 			}
 		}
 
-		private XdrStream CreateXdrStream(bool compression)
+		private XdrStream CreateXdrStreamImpl(bool compression)
 		{
 			return new XdrStream(_networkStream, _characterSet, compression, false);
 		}

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

@@ -477,7 +477,6 @@ protected override void Free(int option)
 				return;
 
 			DoFreePacket(option);
-			_database.XdrStream.Flush();
 			ProcessFreeResponse(_database.ReadResponse());
 		}
 
@@ -499,7 +498,10 @@ protected void DoFreePacket(int option)
 		{
 			try
 			{
-				SendFreeToBuffer(option);
+				_database.XdrStream.Write(IscCodes.op_free_statement);
+				_database.XdrStream.Write(_handle);
+				_database.XdrStream.Write(option);
+				_database.XdrStream.Flush();
 
 				if (option == IscCodes.DSQL_drop)
 				{
@@ -516,13 +518,6 @@ protected void DoFreePacket(int option)
 			}
 		}
 
-		protected void SendFreeToBuffer(int option)
-		{
-			_database.XdrStream.Write(IscCodes.op_free_statement);
-			_database.XdrStream.Write(_handle);
-			_database.XdrStream.Write(option);
-		}
-
 		protected void ProcessFreeResponse(IResponse response)
 		{
 

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsStatement.cs

@@ -193,7 +193,6 @@ protected override void Free(int option)
 				return;
 
 			DoFreePacket(option);
-			_database.XdrStream.Flush();
 			(Database as GdsDatabase).DeferredPackets.Enqueue(ProcessFreeResponse);
 		}
 		#endregion

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

@@ -34,6 +34,7 @@ internal class XdrStream : Stream
 		#region Constants
 
 		private const int PreferredBufferSize = 32 * 1024;
+		private const int InvalidOperation = -1;
 
 		#endregion
 
@@ -308,8 +309,7 @@ public byte[] ToArray()
 		{
 			CheckDisposed();
 
-			var memoryStream = _innerStream as MemoryStream;
-			if (memoryStream == null)
+			if(!(_innerStream is MemoryStream memoryStream))
 				throw new InvalidOperationException();
 			Flush();
 			return memoryStream.ToArray();
@@ -321,7 +321,7 @@ public byte[] ToArray()
 
 		public int ReadOperation()
 		{
-			var op = ValidOperationAvailable ? _operation : ReadNextOperation();
+			var op = _operation != InvalidOperation ? _operation : ReadNextOperation();
 			ResetOperation();
 			return op;
 		}
@@ -358,7 +358,7 @@ public void SetOperation(int operation)
 
 		private void ResetOperation()
 		{
-			_operation = -1;
+			_operation = InvalidOperation;
 		}
 
 		#endregion
@@ -741,14 +741,5 @@ private void EnsureReadable()
 		}
 
 		#endregion
-
-		#region Private Properties
-
-		private bool ValidOperationAvailable
-		{
-			get { return _operation >= 0; }
-		}
-
-		#endregion
 	}
 }