From 22d651b3dd71b72d27c2e295db4b87d3dbb58ea2 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 30 Sep 2017 15:20:29 +0200 Subject: [PATCH 1/3] Set version of netty-transport to 4.1.15.Final as well. I had a java.lang.NoSuchMethodError: io.netty.util.internal.PlatformDependent.newAtomicIntegerFieldUpdater because of conflicting netty versions. This pr updates the old(maybe forgotten) netty dependencies to 4.1.15.Final. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19a8a56..907fcbb 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ io.netty netty-transport - 4.1.5.Final + 4.1.15.Final io.netty From 05ec7d3e22d971b421381d52530bd642bb1d10dc Mon Sep 17 00:00:00 2001 From: Robert Elek Date: Thu, 26 Oct 2017 11:35:38 +0700 Subject: [PATCH 2/3] changed SO_LINGER to be handled as child channel (not server channel) option --- src/main/java/com/corundumstudio/socketio/SocketIOServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/corundumstudio/socketio/SocketIOServer.java b/src/main/java/com/corundumstudio/socketio/SocketIOServer.java index 329d8ec..efa5638 100644 --- a/src/main/java/com/corundumstudio/socketio/SocketIOServer.java +++ b/src/main/java/com/corundumstudio/socketio/SocketIOServer.java @@ -171,8 +171,8 @@ public class SocketIOServer implements ClientListeners { bootstrap.childOption(ChannelOption.RCVBUF_ALLOCATOR, new FixedRecvByteBufAllocator(config.getTcpReceiveBufferSize())); } bootstrap.childOption(ChannelOption.SO_KEEPALIVE, config.isTcpKeepAlive()); + bootstrap.childOption(ChannelOption.SO_LINGER, config.getSoLinger()); - bootstrap.option(ChannelOption.SO_LINGER, config.getSoLinger()); bootstrap.option(ChannelOption.SO_REUSEADDR, config.isReuseAddress()); bootstrap.option(ChannelOption.SO_BACKLOG, config.getAcceptBackLog()); } From fcc7d33df843eb2720529540ac1c37ffa0e262a4 Mon Sep 17 00:00:00 2001 From: Robert Elek Date: Thu, 26 Oct 2017 11:35:38 +0700 Subject: [PATCH 3/3] Issue #481 - changed SO_LINGER to be handled as child channel (not server channel) option --- src/main/java/com/corundumstudio/socketio/SocketIOServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/corundumstudio/socketio/SocketIOServer.java b/src/main/java/com/corundumstudio/socketio/SocketIOServer.java index 329d8ec..efa5638 100644 --- a/src/main/java/com/corundumstudio/socketio/SocketIOServer.java +++ b/src/main/java/com/corundumstudio/socketio/SocketIOServer.java @@ -171,8 +171,8 @@ public class SocketIOServer implements ClientListeners { bootstrap.childOption(ChannelOption.RCVBUF_ALLOCATOR, new FixedRecvByteBufAllocator(config.getTcpReceiveBufferSize())); } bootstrap.childOption(ChannelOption.SO_KEEPALIVE, config.isTcpKeepAlive()); + bootstrap.childOption(ChannelOption.SO_LINGER, config.getSoLinger()); - bootstrap.option(ChannelOption.SO_LINGER, config.getSoLinger()); bootstrap.option(ChannelOption.SO_REUSEADDR, config.isReuseAddress()); bootstrap.option(ChannelOption.SO_BACKLOG, config.getAcceptBackLog()); }