minor fixes

Author: Dmitry-Bryliuk

src/tarantool.client/LogicalConnection.cs

@@ -154,27 +154,25 @@ private async Task<TResponse> SendRequestImpl<TRequest, TResponse>(TRequest requ
 
             try
             {
-                try
-                {
-                    _physicalConnectionLock.EnterWriteLock();
+                _physicalConnectionLock.EnterWriteLock();
 
-                    _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 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);
-                }
-                finally
-                {
-                    _physicalConnectionLock.ExitWriteLock();
-                }
+                _logWriter?.WriteLine($"Begin sending request body buffer, length: {bodyBuffer.Length}");
+                _physicalConnection.Write(bodyBuffer, 0, bodyBuffer.Length);
             }
             catch (Exception ex)
             {
-                _logWriter?.WriteLine($"Request with requestId {requestId} failed, header:\n{ToReadableString(headerBuffer)} \n body: \n{ToReadableString(bodyBuffer)}");
+                _logWriter?.WriteLine(
+                    $"Request with requestId {requestId} failed, header:\n{ToReadableString(headerBuffer)} \n body: \n{ToReadableString(bodyBuffer)}");
                 Dispose();
                 throw;
             }
+            finally
+            {
+                _physicalConnectionLock.ExitWriteLock();
+            }
 
             try
             {

src/tarantool.client/LogicalConnectionManager.cs

@@ -63,12 +63,15 @@ public async Task Connect()
 
             _clientOptions.LogWriter?.WriteLine($"{nameof(LogicalConnectionManager)}: Connected...");
 
-            if (_clientOptions.ConnectionOptions.PingCheckInterval > 0)
+            if (_clientOptions.ConnectionOptions.PingCheckInterval >= 0)
             {
                 _pingCheckInterval = _clientOptions.ConnectionOptions.PingCheckInterval;
             }
 
-            _timer = new Timer(x => CheckPing(), null, _pingTimerInterval, Timeout.Infinite);
+            if (_pingCheckInterval > 0)
+            {
+                _timer = new Timer(x => CheckPing(), null, _pingTimerInterval, Timeout.Infinite);
+            }
         }
 
         private static readonly PingRequest _pingRequest = new PingRequest();
@@ -135,19 +138,32 @@ private async Task EnsureConnection()
             }
         }
 
+        private void ScheduleNextPing()
+        {
+            if (_pingCheckInterval > 0)
+            {
+                _nextPingTime = DateTimeOffset.UtcNow.AddMilliseconds(_pingCheckInterval);
+            }
+        }
+
         public async Task<DataResponse<TResponse[]>> SendRequest<TRequest, TResponse>(TRequest request) where TRequest : IRequest
         {
             await EnsureConnection();
+
             var result = await _droppableLogicalConnection.SendRequest<TRequest, TResponse>(request);
-            _nextPingTime = DateTimeOffset.UtcNow.AddMilliseconds(_pingCheckInterval);
+
+            ScheduleNextPing();
+
             return result;
         }
 
         public async Task SendRequestWithEmptyResponse<TRequest>(TRequest request) where TRequest : IRequest
         {
             await EnsureConnection();
+
             await _droppableLogicalConnection.SendRequestWithEmptyResponse(request);
-            _nextPingTime = DateTimeOffset.UtcNow.AddMilliseconds(_pingCheckInterval);
+
+            ScheduleNextPing();
         }
     }
 }

src/tarantool.client/ResponseReader.cs

@@ -106,27 +106,26 @@ public void BeginReading()
 
         private void EndReading(Task<int> readWork)
         {
-            if (!_disposed)
+            if (_disposed)
             {
-                if (readWork.Status == TaskStatus.RanToCompletion)
-                {
-                    var readBytesCount = readWork.Result;
-                    _clientOptions.LogWriter?.WriteLine($"End reading from connection, read bytes count: {readBytesCount}");
-
-                    if (ProcessReadBytes(readBytesCount))
-                    {
-                        BeginReading();
-                        return;
-                    }
-                }
-
-                _clientOptions.LogWriter?.WriteLine($"Connection read failed: {readWork.Exception}");
-                Dispose();
+                _clientOptions.LogWriter?.WriteLine("Attempt to end reading in disposed state... Exiting.");
+                return;
             }
-            else
+
+            if (readWork.Status == TaskStatus.RanToCompletion)
             {
-                _clientOptions.LogWriter?.WriteLine("Attempt to end reading in disposed state... Exiting.");
+                var readBytesCount = readWork.Result;
+                _clientOptions.LogWriter?.WriteLine($"End reading from connection, read bytes count: {readBytesCount}");
+
+                if (ProcessReadBytes(readBytesCount))
+                {
+                    BeginReading();
+                    return;
+                }
             }
+
+            _clientOptions.LogWriter?.WriteLine($"Connection read failed: {readWork.Exception}");
+            Dispose();
         }
 
         private bool ProcessReadBytes(int readBytesCount)