Merge branch 'master' of git://github.com/enix/Fleck into composable

joeyespo · Sep 28, 2011 · 3151c0f · 3151c0f
2 parents d2780d4 + 43cb016
commit 3151c0f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Fleck/SocketWrapper.cs b/src/Fleck/SocketWrapper.cs
@@ -86,14 +86,14 @@ public Task<ISocket> Accept(Action<ISocket> callback, Action<Exception> error)
 
         public void Dispose()
         {
-            _stream.Dispose();
-            _socket.Dispose();
+            if (_stream != null) _stream.Dispose();
+            if (_socket != null) _socket.Dispose();
         }
 
         public void Close()
         {
-            _stream.Close();
-            _socket.Close();
+            if (_stream != null) _stream.Close();
+            if (_socket != null) _socket.Close();
         }
 
         public int EndSend(IAsyncResult asyncResult)