Fixed race condition when stopping TCP server.

Connections coming in while stopping the TCP server were not correctly handled. Bug: #9
pvginkel · Dec 5, 2015 · 202309b · 202309b
1 parent e20ecdd
commit 202309b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ Thumbs.db
 /_ReSharper.*
 *.nupkg
 /packages
+/.vs
diff --git a/NHttp/HttpServer.cs b/NHttp/HttpServer.cs
@@ -230,17 +230,13 @@ private void StopClients()
 
         private void BeginAcceptTcpClient()
         {
-            if (_state != HttpServerState.Started)
-                return;
-
-            _listener.BeginAcceptTcpClient(AcceptTcpClientCallback, null);
+            var listener = _listener;
+            if (listener != null)
+                listener.BeginAcceptTcpClient(AcceptTcpClientCallback, null);
         }
 
         private void AcceptTcpClientCallback(IAsyncResult asyncResult)
         {
-            if (_state != HttpServerState.Started)
-                return;
-
             try
             {
                 var listener = _listener; // Prevent race condition.
@@ -250,6 +246,14 @@ private void AcceptTcpClientCallback(IAsyncResult asyncResult)
 
                 var tcpClient = listener.EndAcceptTcpClient(asyncResult);
 
+                // If we've stopped already, close the TCP client now.
+
+                if (_state != HttpServerState.Started)
+                {
+                    tcpClient.Close();
+                    return;
+                }
+
                 var client = new HttpClient(this, tcpClient);
 
                 RegisterClient(client);