h4ckx0r/socket.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compatible with socket.io-client 1.2.0

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2014-11-04 01:15:44 +09:00
parent cdafd9e04d
commit 1aa6e4a907
4 changed files with 202 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/github/nkzawa/socketio/client/Socket.java
View File

@@ -81,10 +81,11 @@ public class Socket extends Emitter {
public Socket(Manager io, String nsp) {
this.io = io;
this.nsp = nsp;
this.subEvents();
}
private void subEvents() {
if (this.subs != null) return;
final Manager io = Socket.this.io;
Socket.this.subs = new LinkedList<On.Handle>() {{
add(On.on(io, Manager.EVENT_OPEN, new Listener() {
@@ -117,7 +118,8 @@ public class Socket extends Emitter {
public void run() {
if (Socket.this.connected) return;
Socket.this.io.open();
Socket.this.subEvents();
Socket.this.io.open(); // ensure open
if (Manager.ReadyState.OPEN == Socket.this.io.readyState) Socket.this.onopen();
}
});
@@ -369,8 +371,12 @@ public class Socket extends Emitter {
}
private void destroy() {
for (On.Handle sub : this.subs) {
sub.destroy();
if (this.subs != null) {
// clean subscriptions to avoid reconnection
for (On.Handle sub : this.subs) {
sub.destroy();
}
this.subs = null;
}
this.io.destroy(this);
@@ -385,14 +391,16 @@ public class Socket extends Emitter {
EventThread.exec(new Runnable() {
@Override
public void run() {
if (!Socket.this.connected) return;
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
Socket.this.packet(new Packet(Parser.DISCONNECT));
if (Socket.this.connected) {
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
Socket.this.packet(new Packet(Parser.DISCONNECT));
}
Socket.this.destroy();
Socket.this.onclose("io client disconnect");
if (Socket.this.connected) {
Socket.this.onclose("io client disconnect");
}
}
});
return this;