requested fixes

Dmitry-Bryliuk · Dmitry-Bryliuk · commit 5c398f7ee06a · 2016-12-16T14:44:18.000+03:00
diff --git a/src/tarantool.client/Box.cs b/src/tarantool.client/Box.cs
@@ -17,7 +17,7 @@ public Box(ClientOptions options)
             _clientOptions = options;
             TarantoolConvertersRegistrator.Register(options.MsgPackContext);
 
-            _logicalConnection = new LogicalConnectionWrapper(options);
+            _logicalConnection = new LogicalConnectionManager(options);
         }
 
         public async Task Connect()
diff --git a/src/tarantool.client/LogicalConnection.cs b/src/tarantool.client/LogicalConnection.cs
@@ -42,18 +42,15 @@ public LogicalConnection(ClientOptions options, RequestIdCounter requestIdCounte
 
         public void Dispose()
         {
-            lock (this)
+            if (_disposed)
             {
-                if (_disposed)
-                {
-                    return;
-                }
+                return;
+            }
 
-                _disposed = true;
+            _disposed = true;
 
-                _responseReader.Dispose();
-                _physicalConnection.Dispose();
-            }
+            _responseReader.Dispose();
+            _physicalConnection.Dispose();
         }
 
         public async Task Connect()
@@ -87,7 +84,6 @@ public bool IsConnected()
 
             if (!_responseReader.IsConnected() || !_physicalConnection.IsConnected())
             {
-                Dispose();
                 return false;
             }
 
@@ -155,11 +151,14 @@ private async Task<TResponse> SendRequestImpl<TRequest, TResponse>(TRequest requ
 
             try
             {
-                _logWriter?.WriteLine($"Begin sending request header buffer, requestId: {requestId}, code: {request.Code}, length: {headerBuffer.Length}");
-                _physicalConnection.Write(headerBuffer, 0, Constants.PacketSizeBufferSize + (int)headerLength);
+                lock (_physicalConnection)
+                {
+                    _logWriter?.WriteLine($"Begin sending request header buffer, requestId: {requestId}, code: {request.Code}, length: {headerBuffer.Length}");
+                    _physicalConnection.Write(headerBuffer, 0, Constants.PacketSizeBufferSize + (int)headerLength);
 
-                _logWriter?.WriteLine($"Begin sending request body buffer, length: {bodyBuffer.Length}");
-                _physicalConnection.Write(bodyBuffer, 0, bodyBuffer.Length);
+                    _logWriter?.WriteLine($"Begin sending request body buffer, length: {bodyBuffer.Length}");
+                    _physicalConnection.Write(bodyBuffer, 0, bodyBuffer.Length);
+                }
             }
             catch (Exception ex)
             {
diff --git a/src/tarantool.client/LogicalConnectionManager.cs b/src/tarantool.client/LogicalConnectionManager.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
+﻿using System.Threading.Tasks;
 using ProGaudi.Tarantool.Client.Model.Requests;
 using ProGaudi.Tarantool.Client.Model.Responses;
 
@@ -10,7 +9,7 @@ namespace ProGaudi.Tarantool.Client
     using ProGaudi.Tarantool.Client.Model;
     using ProGaudi.Tarantool.Client.Utils;
 
-    public class LogicalConnectionWrapper : ILogicalConnection
+    public class LogicalConnectionManager : ILogicalConnection
     {
         private readonly ClientOptions _clientOptions;
 
@@ -24,7 +23,7 @@ public class LogicalConnectionWrapper : ILogicalConnection
 
         private const int connectionTimeout = 1000;
 
-        public LogicalConnectionWrapper(ClientOptions options)
+        public LogicalConnectionManager(ClientOptions options)
         {
             _clientOptions = options;
         }
@@ -36,7 +35,7 @@ public void Dispose()
 
         public async Task Connect()
         {
-            _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connecting...");
+            _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connecting...");
 
             _connected.Reset();
 
@@ -46,7 +45,7 @@ public async Task Connect()
 
             _connected.Set();
 
-            _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connected...");
+            _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connected...");
         }
 
         public bool IsConnected()
@@ -61,11 +60,11 @@ private async Task EnsureConnection()
                 return;
             }
 
-            _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connection lost, wait for reconnect...");
+            _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connection lost, wait for reconnect...");
 
             if (!_reconnectAvailable.WaitOne(connectionTimeout))
             {
-                _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Failed to get lock for reconnect");
+                _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Failed to get lock for reconnect");
                 throw ExceptionHelper.NotConnected();
             }
 
@@ -76,7 +75,7 @@ private async Task EnsureConnection()
                     await Connect();
                 }
 
-                _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connection reacquired");
+                _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connection reacquired");
             }
             finally
             {
diff --git a/src/tarantool.client/NetworkStreamPhysicalConnection.cs b/src/tarantool.client/NetworkStreamPhysicalConnection.cs
@@ -24,18 +24,15 @@ internal class NetworkStreamPhysicalConnection : INetworkStreamPhysicalConnectio
 
         public void Dispose()
         {
-            lock (this)
+            if (_disposed)
             {
-                if (_disposed)
-                {
-                    return;
-                }
+                return;
+            }
 
-                _disposed = true;
+            _disposed = true;
 
-                _stream?.Dispose();
-                _socket?.Dispose();
-            }
+            _stream?.Dispose();
+            _socket?.Dispose();
         }
 
         public async Task Connect(ClientOptions options)
@@ -122,6 +119,11 @@ private static Task ConnectAsync(Socket socket, string host, int port)
 
         public bool IsConnected()
         {
+            if (_disposed)
+            {
+                return false;
+            }
+
             try
             {
                 return !(_socket.Poll(1, SelectMode.SelectRead) && _socket.Available == 0);

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public Box(ClientOptions options)`
`17`	`17`	`_clientOptions = options;`
`18`	`18`	`TarantoolConvertersRegistrator.Register(options.MsgPackContext);`
`19`	`19`
`20`		`- _logicalConnection = new LogicalConnectionWrapper(options);`
	`20`	`+ _logicalConnection = new LogicalConnectionManager(options);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public async Task Connect()`
Original file line number	Diff line number	Diff line change
`@@ -42,18 +42,15 @@ public LogicalConnection(ClientOptions options, RequestIdCounter requestIdCounte`
`42`	`42`
`43`	`43`	`public void Dispose()`
`44`	`44`	`{`
`45`		`- lock (this)`
	`45`	`+ if (_disposed)`
`46`	`46`	`{`
`47`		`- if (_disposed)`
`48`		`- {`
`49`		`- return;`
`50`		`- }`
	`47`	`+ return;`
	`48`	`+ }`
`51`	`49`
`52`		`- _disposed = true;`
	`50`	`+ _disposed = true;`
`53`	`51`
`54`		`- _responseReader.Dispose();`
`55`		`- _physicalConnection.Dispose();`
`56`		`- }`
	`52`	`+ _responseReader.Dispose();`
	`53`	`+ _physicalConnection.Dispose();`
`57`	`54`	`}`
`58`	`55`
`59`	`56`	`public async Task Connect()`
`@@ -87,7 +84,6 @@ public bool IsConnected()`
`87`	`84`
`88`	`85`	`if (!_responseReader.IsConnected() \|\| !_physicalConnection.IsConnected())`
`89`	`86`	`{`
`90`		`- Dispose();`
`91`	`87`	`return false;`
`92`	`88`	`}`
`93`	`89`
`@@ -155,11 +151,14 @@ private async Task<TResponse> SendRequestImpl<TRequest, TResponse>(TRequest requ`
`155`	`151`
`156`	`152`	`try`
`157`	`153`	`{`
`158`		`- _logWriter?.WriteLine($"Begin sending request header buffer, requestId: {requestId}, code: {request.Code}, length: {headerBuffer.Length}");`
`159`		`- _physicalConnection.Write(headerBuffer, 0, Constants.PacketSizeBufferSize + (int)headerLength);`
	`154`	`+ lock (_physicalConnection)`
	`155`	`+ {`
	`156`	`+ _logWriter?.WriteLine($"Begin sending request header buffer, requestId: {requestId}, code: {request.Code}, length: {headerBuffer.Length}");`
	`157`	`+ _physicalConnection.Write(headerBuffer, 0, Constants.PacketSizeBufferSize + (int)headerLength);`
`160`	`158`
`161`		`- _logWriter?.WriteLine($"Begin sending request body buffer, length: {bodyBuffer.Length}");`
`162`		`- _physicalConnection.Write(bodyBuffer, 0, bodyBuffer.Length);`
	`159`	`+ _logWriter?.WriteLine($"Begin sending request body buffer, length: {bodyBuffer.Length}");`
	`160`	`+ _physicalConnection.Write(bodyBuffer, 0, bodyBuffer.Length);`
	`161`	`+ }`
`163`	`162`	`}`
`164`	`163`	`catch (Exception ex)`
`165`	`164`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Threading.Tasks;`
	`1`	`+using System.Threading.Tasks;`
`3`	`2`	`using ProGaudi.Tarantool.Client.Model.Requests;`
`4`	`3`	`using ProGaudi.Tarantool.Client.Model.Responses;`
`5`	`4`
`@@ -10,7 +9,7 @@ namespace ProGaudi.Tarantool.Client`
`10`	`9`	`using ProGaudi.Tarantool.Client.Model;`
`11`	`10`	`using ProGaudi.Tarantool.Client.Utils;`
`12`	`11`
`13`		`- public class LogicalConnectionWrapper : ILogicalConnection`
	`12`	`+ public class LogicalConnectionManager : ILogicalConnection`
`14`	`13`	`{`
`15`	`14`	`private readonly ClientOptions _clientOptions;`
`16`	`15`
`@@ -24,7 +23,7 @@ public class LogicalConnectionWrapper : ILogicalConnection`
`24`	`23`
`25`	`24`	`private const int connectionTimeout = 1000;`
`26`	`25`
`27`		`- public LogicalConnectionWrapper(ClientOptions options)`
	`26`	`+ public LogicalConnectionManager(ClientOptions options)`
`28`	`27`	`{`
`29`	`28`	`_clientOptions = options;`
`30`	`29`	`}`
`@@ -36,7 +35,7 @@ public void Dispose()`
`36`	`35`
`37`	`36`	`public async Task Connect()`
`38`	`37`	`{`
`39`		`- _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connecting...");`
	`38`	`+ _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connecting...");`
`40`	`39`
`41`	`40`	`_connected.Reset();`
`42`	`41`
`@@ -46,7 +45,7 @@ public async Task Connect()`
`46`	`45`
`47`	`46`	`_connected.Set();`
`48`	`47`
`49`		`- _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connected...");`
	`48`	`+ _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connected...");`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`public bool IsConnected()`
`@@ -61,11 +60,11 @@ private async Task EnsureConnection()`
`61`	`60`	`return;`
`62`	`61`	`}`
`63`	`62`
`64`		`- _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connection lost, wait for reconnect...");`
	`63`	`+ _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connection lost, wait for reconnect...");`
`65`	`64`
`66`	`65`	`if (!_reconnectAvailable.WaitOne(connectionTimeout))`
`67`	`66`	`{`
`68`		`- _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Failed to get lock for reconnect");`
	`67`	`+ _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Failed to get lock for reconnect");`
`69`	`68`	`throw ExceptionHelper.NotConnected();`
`70`	`69`	`}`
`71`	`70`
`@@ -76,7 +75,7 @@ private async Task EnsureConnection()`
`76`	`75`	`await Connect();`
`77`	`76`	`}`
`78`	`77`
`79`		`- _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionWrapper)}: Connection reacquired");`
	`78`	`+ _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connection reacquired");`
`80`	`79`	`}`
`81`	`80`	`finally`
`82`	`81`	`{`