Merge pull request codebutler#14 from orenda/patch-1

koush · koush · commit 540884327449 · 2013-05-20T09:57:55.000-07:00
Update SocketIOClient.java - onError failed on nullPointerException
diff --git a/src/com/codebutler/android_websockets/SocketIOClient.java b/src/com/codebutler/android_websockets/SocketIOClient.java
@@ -267,7 +267,8 @@ public void disconnect() throws IOException {
     }
 
     private void cleanup() {
-        mClient.disconnect();
+        if (mClient != null)
+            mClient.disconnect();
         mClient = null;
 
         mSendLooper.quit();

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,8 @@ public void disconnect() throws IOException {`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`private void cleanup() {`
`270`		`- mClient.disconnect();`
	`270`	`+ if (mClient != null)`
	`271`	`+ mClient.disconnect();`
`271`	`272`	`mClient = null;`
`272`	`273`
`273`	`274`	`mSendLooper.quit();`