diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-10-26 19:02:19 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-10-26 19:02:19 -0700 |
| commit | c4c67e591bbe3cb55d6f282a9267b913c9e3f841 (patch) | |
| tree | 75102193f3d12321cc17088e6dccb9c7282921ec | |
| parent | 502aa68bb7c4f2482c6145328542d61d67a60aa6 (diff) | |
| download | infinitytier-c4c67e591bbe3cb55d6f282a9267b913c9e3f841.tar.gz infinitytier-c4c67e591bbe3cb55d6f282a9267b913c9e3f841.zip | |
add error handling for JSON serialization
| -rw-r--r-- | windows/WinUI/APIHandler.cs | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/windows/WinUI/APIHandler.cs b/windows/WinUI/APIHandler.cs index 0755c28d..8e7408a5 100644 --- a/windows/WinUI/APIHandler.cs +++ b/windows/WinUI/APIHandler.cs @@ -41,7 +41,15 @@ namespace WinUI { 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; } } @@ -61,9 +69,16 @@ namespace WinUI using (var streamReader = new StreamReader(httpResponse.GetResponseStream())) { 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; } } @@ -119,9 +134,16 @@ namespace WinUI using (var streamReader = new StreamReader(httpResponse.GetResponseStream())) { 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; } } |