Merge pull request #26 from shdwp/master

Fixed NullReference if socket was closed too fast.
dotnet · Aug 23, 2019 · 502c952 · 502c952
2 parents b9cb8d4 + 6d25f84
commit 502c952
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/WatsonWebserver/WatsonWebserver.cs b/WatsonWebserver/WatsonWebserver.cs
@@ -264,15 +264,14 @@ private void AcceptConnections(CancellationToken token)
                         if (token.IsCancellationRequested) throw new OperationCanceledException();
 
                         var context = c as HttpListenerContext;
-
-                        Events.ConnectionReceived(
-                            context.Request.RemoteEndPoint.Address.ToString(),
-                            context.Request.RemoteEndPoint.Port);
-
                         HttpRequest req = null;
-
+                        
                         try
                         {
+                            Events.ConnectionReceived(
+                                context.Request.RemoteEndPoint.Address.ToString(),
+                                context.Request.RemoteEndPoint.Port);
+                        
                             // Populate HTTP request object
                             req = new HttpRequest(context, ReadInputStream);
                             if (req == null)