From 69bde655eb418def80481cd06f35258916708ea4 Mon Sep 17 00:00:00 2001 From: Tanghd Date: Mon, 12 Mar 2018 10:05:45 +0800 Subject: [PATCH 1/3] implements onPingException --- .../socketio/listener/ExceptionListenerAdapter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/corundumstudio/socketio/listener/ExceptionListenerAdapter.java b/src/main/java/com/corundumstudio/socketio/listener/ExceptionListenerAdapter.java index 89efc0f..444a464 100644 --- a/src/main/java/com/corundumstudio/socketio/listener/ExceptionListenerAdapter.java +++ b/src/main/java/com/corundumstudio/socketio/listener/ExceptionListenerAdapter.java @@ -45,4 +45,9 @@ public abstract class ExceptionListenerAdapter implements ExceptionListener { return false; } + @Override + public void onPingException(Exception e, SocketIOClient client) { + + } + } From 10e7d0fa3a84888fb77f70be0361b440d8eb7197 Mon Sep 17 00:00:00 2001 From: Joel Koh Date: Thu, 3 May 2018 17:21:12 +0800 Subject: [PATCH 2/3] fixed underlying connection not closing on ping timeout --- .../java/com/corundumstudio/socketio/handler/ClientHead.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java b/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java index 82cd860..662624b 100644 --- a/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java +++ b/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java @@ -125,7 +125,7 @@ public class ClientHead { public void run() { ClientHead client = clientsBox.get(sessionId); if (client != null) { - client.onChannelDisconnect(); + client.disconnect(); log.debug("{} removed due to ping timeout", sessionId); } } From 5eaaf5a73a66587f2959a8328a0f2a4942aa7d93 Mon Sep 17 00:00:00 2001 From: Joel Koh Date: Thu, 3 May 2018 17:24:23 +0800 Subject: [PATCH 3/3] fixed disconnect null pointer --- .../java/com/corundumstudio/socketio/handler/ClientHead.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java b/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java index 662624b..0612a59 100644 --- a/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java +++ b/src/main/java/com/corundumstudio/socketio/handler/ClientHead.java @@ -205,7 +205,9 @@ public class ClientHead { public void disconnect() { ChannelFuture future = send(new Packet(PacketType.DISCONNECT)); - future.addListener(ChannelFutureListener.CLOSE); + if(future != null) { + future.addListener(ChannelFutureListener.CLOSE); + } onChannelDisconnect(); }