aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoushik Dutta <koush@koushikdutta.com>2015-08-01 15:47:12 -0700
committerKoushik Dutta <koush@koushikdutta.com>2015-08-01 15:47:12 -0700
commitc953017c1b80cc1af613db77adae90b4242e3ca3 (patch)
treed528dc2447d6a3798300719387fd0042bdbb2542
parentf585d5b7e48ae6ec87992185a0281ac92ba10d5d (diff)
parentd68d7908edf1430db39d0d396edbadffaf163445 (diff)
downloadAndroidAsync-c953017c1b80cc1af613db77adae90b4242e3ca3.tar.gz
AndroidAsync-c953017c1b80cc1af613db77adae90b4242e3ca3.tar.bz2
AndroidAsync-c953017c1b80cc1af613db77adae90b4242e3ca3.zip
Merge pull request #378 from Ninjanetic/issue-295-null-object
Handle cases where the transport becomes null during the socketIO heartbeat
-rw-r--r--AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
index 0407f22..cd74560 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/socketio/SocketIOConnection.java
@@ -176,8 +176,11 @@ class SocketIOConnection {
public void run() {
if (heartbeat <= 0 || ts != transport || ts == null || !ts.isConnected())
return;
+
transport.send("2:::");
- transport.getServer().postDelayed(this, heartbeat);
+
+ if (transport != null)
+ transport.getServer().postDelayed(this, heartbeat);
}
};
heartbeatRunner.run();