Browse Source

add error handling for JSON serialization

Grant Limberg 9 years ago
parent
commit
c4c67e591b
1 changed files with 27 additions and 5 deletions
  1. 27 5
      windows/WinUI/APIHandler.cs

+ 27 - 5
windows/WinUI/APIHandler.cs

@@ -41,7 +41,15 @@ namespace WinUI
             {
             {
                 var responseText = streamReader.ReadToEnd();
                 var responseText = streamReader.ReadToEnd();
 
 
-                ZeroTierStatus status = JsonConvert.DeserializeObject<ZeroTierStatus>(responseText);
+                ZeroTierStatus status = null;
+                try
+                {
+                    status = JsonConvert.DeserializeObject<ZeroTierStatus>(responseText);
+                }
+                catch (JsonReaderException e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
                 return status;
                 return status;
             }
             }
         }
         }
@@ -61,9 +69,16 @@ namespace WinUI
             using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
             using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
             {
             {
                 var responseText = streamReader.ReadToEnd();
                 var responseText = streamReader.ReadToEnd();
-                Console.WriteLine(responseText);
 
 
-                List<ZeroTierNetwork> networkList = JsonConvert.DeserializeObject<List<ZeroTierNetwork>>(responseText);
+                List<ZeroTierNetwork> networkList = null;
+                try
+                {
+                    networkList = JsonConvert.DeserializeObject<List<ZeroTierNetwork>>(responseText);
+                }
+                catch (JsonReaderException e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
                 return networkList;
                 return networkList;
             }
             }
         }
         }
@@ -119,9 +134,16 @@ namespace WinUI
             using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
             using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
             {
             {
                 var responseText = streamReader.ReadToEnd();
                 var responseText = streamReader.ReadToEnd();
-                Console.WriteLine(responseText);
 
 
-                List<ZeroTierPeer> peerList = JsonConvert.DeserializeObject<List<ZeroTierPeer>>(responseText);
+                List<ZeroTierPeer> peerList = null;
+                try
+                {
+                    peerList = JsonConvert.DeserializeObject<List<ZeroTierPeer>>(responseText);
+                }
+                catch (JsonReaderException e)
+                {
+                    Console.WriteLine(e.ToString());
+                }
                 return peerList;
                 return peerList;
             }
             }
         }
         }