Implemented FSE bug reporting !!!

1 files changed, 27 insertions, 20 deletions

diff --git a/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs b/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs
index fde08b968..14b9a7562 100644
--- a/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs
+++ b/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs
@@ -103,36 +103,43 @@ namespace Tango.Transport.Web
                 }
                 catch (HttpRequestException ex)
                 {
-                    String message = JObject.Parse(data).GetValue("Message").ToString();
-                    Exception exception = null;
-
                     try
                     {
-                        String exceptionMessage = JObject.Parse(data).GetValue("ExceptionMessage").ToString();
-                        String exceptionType = JObject.Parse(data).GetValue("ExceptionType").ToString();
-                        String stackTrace = JObject.Parse(data).GetValue("StackTrace").ToString();
-                        Type type = GetType(exceptionType);
-                        if (type != null)
+                        String message = JObject.Parse(data).GetValue("Message").ToString();
+                        Exception exception = null;
+
+                        try
                         {
-                            exception = Activator.CreateInstance(type, new object[] { exceptionMessage + "\n" + stackTrace }) as Exception;
-                            
+                            String exceptionMessage = JObject.Parse(data).GetValue("ExceptionMessage").ToString();
+                            String exceptionType = JObject.Parse(data).GetValue("ExceptionType").ToString();
+                            String stackTrace = JObject.Parse(data).GetValue("StackTrace").ToString();
+                            Type type = GetType(exceptionType);
+                            if (type != null)
+                            {
+                                exception = Activator.CreateInstance(type, new object[] { exceptionMessage + "\n" + stackTrace }) as Exception;
+
+                            }
+                            else
+                            {
+                                exception = new HttpException(exceptionMessage + "\n" + stackTrace);
+                            }
                         }
-                        else
+                        catch
                         {
-                            exception = new HttpException(exceptionMessage + "\n" + stackTrace);
+                            if (message == null)
+                            {
+                                Logging.LogManager.Default.Log($"Error parsing response message!\n{data}");
+                            }
+
+                            throw new HttpRequestException(ex.Message + " " + message);
                         }
+
+                        throw exception;
                     }
                     catch
                     {
-                        if (message == null)
-                        {
-                            Logging.LogManager.Default.Log($"Error parsing response message!\n{data}");
-                        }
-
-                        throw new HttpRequestException(ex.Message + " " + message);
+                        throw ex;
                     }
-
-                    throw exception;
                 }
 
                 return JsonConvert.DeserializeObject<Response>(data);