CSHARP-1704: disposing of sockets in failure scenarios.

mongodb · Aug 10, 2016 · 25d1ee8 · 25d1ee8
1 parent 5498c70
commit 25d1ee8
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/MongoDB.Driver.Core/Core/Connections/TcpStreamFactory.cs b/src/MongoDB.Driver.Core/Core/Connections/TcpStreamFactory.cs
@@ -150,16 +150,13 @@ private void Connect(Socket socket, EndPoint endPoint, CancellationToken cancell
                 {
                     if (!cancelled && !timedOut)
                     {
-                        socket.Dispose();
+                        try { socket.Dispose(); } catch { }
                         throw;
                     }
                 }
             }
 
-            if (socket.Connected)
-            {
-                try { socket.Dispose(); } catch { }
-            }
+            try { socket.Dispose(); } catch { }
 
             cancellationToken.ThrowIfCancellationRequested();
             if (timedOut)
@@ -201,16 +198,13 @@ private async Task ConnectAsync(Socket socket, EndPoint endPoint, CancellationTo
                 {
                     if (!cancelled && !timedOut)
                     {
-                        socket.Dispose();
+                        try { socket.Dispose(); } catch { }
                         throw;
                     }
                 }
             }
 
-            if (socket.Connected)
-            {
-                try { socket.Dispose(); } catch { }
-            }
+            try { socket.Dispose(); } catch { }
 
             cancellationToken.ThrowIfCancellationRequested();
             if (timedOut)