diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java index b0fc1384d9..70f1dd8292 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java @@ -221,7 +221,8 @@ public class NioClientSocketChannelFactory implements ClientSocketChannelFactory } public void releaseExternalResources() { - shutdown(); + bossPool.shutdown(); + workerPool.shutdown(); releasePools(); } diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java index 4d5925feda..0c6d74413e 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java @@ -215,7 +215,7 @@ public class NioDatagramChannelFactory implements DatagramChannelFactory { } public void releaseExternalResources() { - shutdown(); + workerPool.shutdown(); releasePool(); } diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java index 74245adf26..d892538896 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java @@ -214,7 +214,8 @@ public class NioServerSocketChannelFactory implements ServerSocketChannelFactory } public void releaseExternalResources() { - shutdown(); + bossPool.shutdown(); + workerPool.shutdown(); releasePools(); } diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java index 6a6a8c29bc..115cfd4482 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java @@ -127,7 +127,6 @@ public class OioClientSocketChannelFactory implements ClientSocketChannelFactory } public void releaseExternalResources() { - shutdown(); ExecutorUtil.shutdownNow(workerExecutor); } } diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java index 6e0e9018a4..91c00d85c9 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java @@ -126,7 +126,6 @@ public class OioDatagramChannelFactory implements DatagramChannelFactory { } public void releaseExternalResources() { - shutdown(); ExecutorUtil.shutdownNow(workerExecutor); } } diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java index 2db9dd0ce5..88cf3cc44c 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java @@ -150,7 +150,6 @@ public class OioServerSocketChannelFactory implements ServerSocketChannelFactory } public void releaseExternalResources() { - shutdown(); ExecutorUtil.shutdownNow(workerExecutor); } }