Merge pull request koush#4 from bkase/fix_noargs

Fixed crash on a no-argument message
bkase · Jan 3, 2013 · 7de2163 · 7de2163
2 parents e088b9e + 6adfa2a
commit 7de2163
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/com/codebutler/android_websockets/SocketIOClient.java b/src/com/codebutler/android_websockets/SocketIOClient.java
@@ -116,7 +116,12 @@ public void onMessage(String message) {
                         final String dataString = parts[3];
                         JSONObject data = new JSONObject(dataString);
                         String event = data.getString("name");
-                        JSONArray args = data.getJSONArray("args");
+                        JSONArray args;
+                        try {
+                            args = data.getJSONArray("args");
+                        } catch (JSONException e) {
+                            args = new JSONArray();
+                        }
                         if (!"".equals(messageId)) {
                             mSendHandler.post(new Runnable() {
                                 @Override