DNET-415, DNET-416

NETProvider/source/FirebirdSql/Data/Services/FbService.cs

@@ -199,10 +199,12 @@ protected void Close()
 
 		protected void StartTask()
 		{
+			bool shouldClose = false;
 			if (this.state == FbServiceState.Closed)
 			{
 				// Attach to Service Manager
 				this.Open();
+				shouldClose = true;
 			}
 
 			try
@@ -214,27 +216,44 @@ protected void StartTask()
 			{
 				throw new FbException(ex.Message, ex);
 			}
+			finally
+			{
+				if (shouldClose)
+				{
+					this.Close();
+				}
+			}
 		}
 
 		protected byte[] QueryService(byte[] items)
 		{
+			bool shouldClose = false;
 			if (this.state == FbServiceState.Closed)
 			{
 				// Attach to Service Manager
 				this.Open();
+				shouldClose = true;
 			}
 
 			if (this.querySpb == null)
 			{
 				this.querySpb = new ServiceParameterBuffer();
 			}
 
-			// Response	buffer
-			byte[] buffer = new byte[this.queryBufferSize];
-
-			this.svc.Query(this.querySpb, items.Length, items, buffer.Length, buffer);
-
-			return buffer;
+			try
+			{
+				// Response	buffer
+				byte[] buffer = new byte[this.queryBufferSize];
+				this.svc.Query(this.querySpb, items.Length, items, buffer.Length, buffer);
+				return buffer;
+			}
+			finally
+			{
+				if (shouldClose)
+				{
+					this.Close();
+				}
+			}
 		}
 
 		protected ArrayList ParseQueryInfo(byte[] buffer)