Merge dev

Author: peombwa

tools/Custom/HttpMessageLogFormatter.cs

@@ -21,7 +21,12 @@ public static string GetHttpRequestLog(HttpRequestMessage request)
         {
             if (request == null) return string.Empty;
 
-            string body = (request.Content == null) ? string.Empty : FormatString(request.Content.ReadAsStringAsync().Result);
+            string body = string.Empty;
+            try
+            {
+                body = FormatString(request.Content.ReadAsStringAsync().Result);
+            }
+            catch { }
 
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.AppendLine($"============================ HTTP REQUEST ============================{Environment.NewLine}");
@@ -36,7 +41,12 @@ public static string GetHttpResponseLog(HttpResponseMessage response)
         {
             if (response == null) return string.Empty;
 
-            string body = (response.Content == null) ? string.Empty : FormatString(response.Content.ReadAsStringAsync().Result);
+            string body = string.Empty;
+            try
+            {
+                body = FormatString(response.Content.ReadAsStringAsync().Result);
+            }
+            catch { }
 
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.AppendLine($"============================ HTTP RESPONSE ============================{Environment.NewLine}");