Merge pull request #30 from 2gis/fix-empty-request-crash

Fix listener crashing on empty incoming request
2gis · Mar 28, 2017 · 3bf2bca · 3bf2bca
2 parents cab59f9 + 58bed5d
commit 3bf2bca
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/Winium.StoreApps.Driver/Listener/JWPListener.cs b/Winium.StoreApps.Driver/Listener/JWPListener.cs
@@ -97,19 +97,27 @@ public void StartListening()
                     using (var stream = client.GetStream())
                     {
                         var acceptedRequest = HttpRequest.ReadFromStreamWithoutClosing(stream);
-                        Logger.Debug("ACCEPTED REQUEST {0}", acceptedRequest.StartingLine);
 
-                        var response = this.HandleRequest(acceptedRequest);
-                        using (var writer = new StreamWriter(stream))
+                        if (string.IsNullOrWhiteSpace(acceptedRequest.StartingLine))
                         {
-                            try
-                            {
-                                writer.Write(response);
-                                writer.Flush();
-                            }
-                            catch (IOException ex)
+                            Logger.Warn("ACCEPTED EMPTY REQUEST");
+                        }
+                        else
+                        {
+                            Logger.Debug("ACCEPTED REQUEST {0}", acceptedRequest.StartingLine);
+
+                            var response = this.HandleRequest(acceptedRequest);
+                            using (var writer = new StreamWriter(stream))
                             {
-                                Logger.Error("Error occured while writing response: {0}", ex);
+                                try
+                                {
+                                    writer.Write(response);
+                                    writer.Flush();
+                                }
+                                catch (IOException ex)
+                                {
+                                    Logger.Error("Error occured while writing response: {0}", ex);
+                                }
                             }
                         }