Merge pull request #96 from tobicz/master

mattqs · mattqs · commit 087b647c07bd · 2016-05-03T17:23:36.000+10:00
bugfix: check first if the token KEY_PLACEHOLDER is available, otherwise an exception occurs and null is returned
diff --git a/Src/SocketIoClientDotNet.net45/Parser/Binary.cs b/Src/SocketIoClientDotNet.net45/Parser/Binary.cs
@@ -192,7 +192,8 @@ private static object _reconstructPacket(object data, byte[][] buffers)
             var newData1 = new JObject();
             var _data1 = (JObject)data;
 
-            if ((bool) _data1[KEY_PLACEHOLDER])
+            //if ((bool) _data1[KEY_PLACEHOLDER])
+            if (_data1.SelectToken(KEY_PLACEHOLDER) != null && (bool) _data1[KEY_PLACEHOLDER])
             {
                 var num = (int)_data1[KEY_NUM];
                 return num >= 0 && num < buffers.Length ? buffers[num] : null;

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ private static object _reconstructPacket(object data, byte[][] buffers)`
`192`	`192`	`var newData1 = new JObject();`
`193`	`193`	`var _data1 = (JObject)data;`
`194`	`194`
`195`		`- if ((bool) _data1[KEY_PLACEHOLDER])`
	`195`	`+ //if ((bool) _data1[KEY_PLACEHOLDER])`
	`196`	`+ if (_data1.SelectToken(KEY_PLACEHOLDER) != null && (bool) _data1[KEY_PLACEHOLDER])`
`196`	`197`	`{`
`197`	`198`	`var num = (int)_data1[KEY_NUM];`
`198`	`199`	`return num >= 0 && num < buffers.Length ? buffers[num] : null;`