fix: fix error handling

tngraf · tngraf · commit 3c0539c74536 · 2022-12-30T09:00:28.000+01:00
diff --git a/Fossology.Rest.Dotnet/RestApi.cs b/Fossology.Rest.Dotnet/RestApi.cs
@@ -373,38 +373,48 @@ private static void CheckForErrors(RestResponseBase response)
                 throw new FossologyApiException(ErrorCode.Unauthorized, response.StatusCode);
             } // if
 
-            var forceError = false;
+            FossologyApiException exception;
             try
             {
                 if (string.IsNullOrEmpty(response.Content))
                 {
-                    throw new FossologyApiException(
+                    exception = new FossologyApiException(
                         ErrorCode.RestApiError, response.StatusCode, string.Empty, null);
-                } // if
-
-                if (response.Content.ToLower().StartsWith("<html>"))
-                {
-                    throw new FossologyApiException(
-                        ErrorCode.RestApiError, response.StatusCode, response.Content, null);
-                } // if
-
-                var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Result>(response.Content);
-                if (result != null)
+                }
+                else
                 {
-                    throw new FossologyApiException(
-                        ErrorCode.RestApiError, (HttpStatusCode)result.Code, result.Message, null);
+                    if (response.Content.ToLower().StartsWith("<html>"))
+                    {
+                        exception = new FossologyApiException(
+                            ErrorCode.RestApiError, response.StatusCode, response.Content, null);
+                    }
+                    else
+                    {
+                        var result = Newtonsoft.Json.JsonConvert.DeserializeObject<Result>(response.Content);
+                        if (result != null)
+                        {
+                            exception = new FossologyApiException(
+                                ErrorCode.RestApiError, (HttpStatusCode)result.Code, result.Message, null);
+                        }
+                        else
+                        {
+                            exception = new FossologyApiException(
+                                ErrorCode.RestApiError,
+                                response.StatusCode,
+                                "Unable to decode JSON response",
+                                null);
+                        } // if
+                    } // if
                 } // if
-
-                Log.Warn("Unable to decode JSON response");
             }
             catch
             {
-                forceError = true;
+                exception = new FossologyApiException(ErrorCode.RestApiError);
             } // catch
 
-            if (forceError)
+            if (exception != null)
             {
-                throw new FossologyApiException(ErrorCode.RestApiError);
+                throw exception;
             } // if
         } // CheckForErrors()
 
