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

shutdown ExecutorServices

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2014-08-17 02:33:09 +09:00
parent b08115c7e3
commit b07856e927
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/github/nkzawa/socketio/client/Manager.java
View File

@@ -94,8 +94,8 @@ public class Manager extends Emitter {
*/ */
private ConcurrentHashMap<String, Socket> nsps; private ConcurrentHashMap<String, Socket> nsps;
private ScheduledExecutorService timeoutScheduler = Executors.newSingleThreadScheduledExecutor(); private ScheduledExecutorService timeoutScheduler;
private ScheduledExecutorService reconnectScheduler = Executors.newSingleThreadScheduledExecutor(); private ScheduledExecutorService reconnectScheduler;
public Manager() { public Manager() {
@@ -251,7 +251,7 @@ public class Manager extends Emitter {
final long timeout = Manager.this._timeout; final long timeout = Manager.this._timeout;
logger.fine(String.format("connection attempt will timeout after %d", timeout)); logger.fine(String.format("connection attempt will timeout after %d", timeout));
final Future timer = timeoutScheduler.schedule(new Runnable() { final Future timer = getTimeoutScheduler().schedule(new Runnable() {
@Override @Override
public void run() { public void run() {
EventThread.exec(new Runnable() { EventThread.exec(new Runnable() {
@@ -421,6 +421,14 @@ public class Manager extends Emitter {
this.cleanup(); this.cleanup();
this.readyState = ReadyState.CLOSED; this.readyState = ReadyState.CLOSED;
this.emit(EVENT_CLOSE, reason); this.emit(EVENT_CLOSE, reason);
if (this.timeoutScheduler != null) {
this.timeoutScheduler.shutdown();
}
if (this.reconnectScheduler != null) {
this.reconnectScheduler.shutdown();
}
if (this._reconnection && !this.skipReconnect) { if (this._reconnection && !this.skipReconnect) {
this.reconnect(); this.reconnect();
} }
@@ -442,7 +450,7 @@ public class Manager extends Emitter {
logger.fine(String.format("will wait %dms before reconnect attempt", delay)); logger.fine(String.format("will wait %dms before reconnect attempt", delay));
this.reconnecting = true; this.reconnecting = true;
final Future timer = this.reconnectScheduler.schedule(new Runnable() { final Future timer = this.getReconnectScheduler().schedule(new Runnable() {
@Override @Override
public void run() { public void run() {
EventThread.exec(new Runnable() { EventThread.exec(new Runnable() {
@@ -486,6 +494,20 @@ public class Manager extends Emitter {
this.emitAll(EVENT_RECONNECT, attempts); this.emitAll(EVENT_RECONNECT, attempts);
} }
private ScheduledExecutorService getTimeoutScheduler() {
if (this.timeoutScheduler == null || this.timeoutScheduler.isShutdown()) {
this.timeoutScheduler = Executors.newSingleThreadScheduledExecutor();
}
return timeoutScheduler;
}
private ScheduledExecutorService getReconnectScheduler() {
if (this.reconnectScheduler == null || this.reconnectScheduler.isShutdown()) {
this.reconnectScheduler = Executors.newSingleThreadScheduledExecutor();
}
return this.reconnectScheduler;
}
public static interface OpenCallback { public static interface OpenCallback {