Fix for issue #219.

chromelyapps · Jul 5, 2020 · 760ef7c · 760ef7c
1 parent afda7d1
commit 760ef7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/Chromely.Core/Defaults/DefaultRequestTaskRunner.cs b/src/Chromely.Core/Defaults/DefaultRequestTaskRunner.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Threading.Tasks;
 using Chromely.Core.Configuration;
 using Chromely.Core.Infrastructure;
@@ -175,8 +176,8 @@ private ChromelyResponse ExecuteRoute(string requestId, RoutePath routePath, IDi
 
             var response = route.Invoke(requestId: requestId, routePath: routePath, parameters: parameters, postData: postData, rawJson: requestData);
             response.ReadyState = (int)ReadyState.ResponseIsReady;
-            response.Status = (response.Status == 0) ? (int)System.Net.HttpStatusCode.OK : response.Status;
-            response.StatusText = (string.IsNullOrWhiteSpace(response.StatusText)) ? "OK" : response.StatusText;
+            response.Status = (response.Status == 0) ? (int)HttpStatusCode.OK : response.Status;
+            response.StatusText = (string.IsNullOrWhiteSpace(response.StatusText) && (response.Status == (int)HttpStatusCode.OK)) ? "OK" : response.StatusText;
 
             return response;
         }
@@ -201,8 +202,8 @@ private async Task<ChromelyResponse> ExecuteRouteAsync(string requestId, RoutePa
             }
 
             response.ReadyState = (int)ReadyState.ResponseIsReady;
-            response.Status = (response.Status == 0 ) ? (int)System.Net.HttpStatusCode.OK : response.Status;
-            response.StatusText = (string.IsNullOrWhiteSpace(response.StatusText)) ? "OK" : response.StatusText;
+            response.Status = (response.Status == 0 ) ? (int)HttpStatusCode.OK : response.Status;
+            response.StatusText = (string.IsNullOrWhiteSpace(response.StatusText) && (response.Status == (int)HttpStatusCode.OK)) ? "OK" : response.StatusText;
 
             return response;
         }
@@ -224,8 +225,8 @@ private ChromelyResponse GetInfo(string requestId)
             };
 
             response.ReadyState = (int)ReadyState.ResponseIsReady;
-            response.Status = (response.Status == 0) ? (int)System.Net.HttpStatusCode.OK : response.Status;
-            response.StatusText = (string.IsNullOrWhiteSpace(response.StatusText)) ? "OK" : response.StatusText;
+            response.Status = (int)HttpStatusCode.OK;
+            response.StatusText = "OK";
             response.Data = infoItemDic;
 
             return response;

diff --git a/src/Chromely.Core/Network/ChromelyResponse.cs b/src/Chromely.Core/Network/ChromelyResponse.cs
@@ -20,6 +20,7 @@ public class ChromelyResponse
         public ChromelyResponse()
         {
             RequestId = string.Empty;
+            StatusText = string.Empty;
         }
 
         /// <summary>
@@ -31,6 +32,7 @@ public ChromelyResponse()
         public ChromelyResponse(string requestId)
         {
             RequestId = requestId;
+            StatusText = string.Empty;
         }
 
         /// <summary>