IGNITE-7399 .NET: Thin client: Fix NPE in Dispose

apache · Jan 15, 2018 · 66cf82d · 66cf82d
1 parent 31c60bd
commit 66cf82d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs
@@ -303,6 +303,21 @@ public void TestIdleTimeout()
             }
         }
 
+        /// <summary>
+        /// Tests the protocol mismatch behavior: attempt to connect to an HTTP endpoint.
+        /// </summary>
+        [Test]
+        public void TestProtocolMismatch()
+        {
+            using (Ignition.Start(TestUtils.GetTestConfiguration()))
+            {
+                // Connect to Ignite REST endpoint.
+                var cfg = new IgniteClientConfiguration {Host = "127.0.0.1", Port = 11211 };
+                var ex = Assert.Throws<SocketException>(() => Ignition.StartClient(cfg));
+                Assert.AreEqual(SocketError.ConnectionAborted, ex.SocketErrorCode);
+            }
+        }
+
         /// <summary>
         /// Starts the client.
         /// </summary>

diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientSocket.cs
@@ -590,7 +590,11 @@ public void Dispose()
                 _socket.Dispose();
                 _listenerEvent.Set();
                 _listenerEvent.Dispose();
-                _timeoutCheckTimer.Dispose();
+
+                if (_timeoutCheckTimer != null)
+                {
+                    _timeoutCheckTimer.Dispose();
+                }
 
                 // Wait for lock to be released and dispose.
                 if (!_sendRequestLock.IsWriteLockHeld)