Merge pull request #107 from cnblogs/improve-connecting-socket

Improve connecting socket

Author: cnblogs-dudu

Enyim.Caching/Memcached/PooledSocket.cs

@@ -58,21 +58,27 @@ public void Connect()
             cts.CancelAfter(_connectionTimeout);
             void Cancel()
             {
-                if (!_socket.Connected)
+                if (_socket != null && !_socket.Connected)
                 {
                     _socket.Dispose();
+                    _socket = null;
                 }
             }
             cts.Token.Register(Cancel);
 
             _socket.Connect(_endpoint);
-            if (_socket.Connected)
-            {
-                success = true;
-            }
-            else
+
+            if (_socket != null)
             {
-                _socket.Dispose();
+                if (_socket.Connected)
+                {
+                    success = true;
+                }
+                else
+                {
+                    _socket.Dispose();
+                    _socket = null;
+                }
             }
 
             if (success)
@@ -94,14 +100,23 @@ public async Task ConnectAsync()
             {
                 await connTask;
             }
-
-            if (_socket.Connected)
+            else if (_socket != null)
             {
-                success = true;
+                _socket.Dispose();
+                _socket = null;
             }
-            else
+
+            if (_socket != null)
             {
-                _socket.Dispose();
+                if (_socket.Connected)
+                {
+                    success = true;
+                }
+                else
+                {
+                    _socket.Dispose();
+                    _socket = null;
+                }
             }
 
             if (success)