aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael VanOverbeek <[email protected]>2017-02-15 22:11:27 +0000
committerMichael VanOverbeek <[email protected]>2017-02-15 22:11:27 +0000
commit18604c054acfe2d0137dbd9dd6a2c30a69c3fbdf (patch)
tree6826702f6615fdd952ae730c94291d914c9343e1
parent91f97a65b2c6d1fad3a211a6739a49d9908f69a2 (diff)
downloadshiftos_thereturn-18604c054acfe2d0137dbd9dd6a2c30a69c3fbdf.tar.gz
shiftos_thereturn-18604c054acfe2d0137dbd9dd6a2c30a69c3fbdf.tar.bz2
shiftos_thereturn-18604c054acfe2d0137dbd9dd6a2c30a69c3fbdf.zip
moar fixes n' stuff
-rw-r--r--ShiftOS.Server/Program.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs
index 376f95f..0cae991 100644
--- a/ShiftOS.Server/Program.cs
+++ b/ShiftOS.Server/Program.cs
@@ -295,10 +295,11 @@ namespace ShiftOS.Server
object result = null;
try
{
- result = Convert.ChangeType(JsonConvert.DeserializeObject(msg.Contents), mAttrib.ExpectedType);
+ result = JsonConvert.DeserializeObject(msg.Contents, mAttrib.ExpectedType);
}
- catch
+ catch (Exception ex)
{
+ Console.WriteLine(ex);
result = null;
}
if (result == null)