From 5bce8b9430899cc9bf8201e8e29de5aee82b9270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= Date: Mon, 14 Jan 2013 16:05:49 +0100 Subject: [PATCH] Fixed issue with Netty not releasing worker threads properly #2733 --- .../scala/akka/remote/transport/netty/NettyTransport.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala index 48436b3569..6550753214 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala @@ -379,7 +379,11 @@ class NettyTransport(private val settings: NettyTransportSettings, private val s _ ← always(channelGroup.write(ChannelBuffers.buffer(0))) _ ← always({ channelGroup.unbind(); channelGroup.disconnect() }) _ ← always(channelGroup.close()) - } inboundBootstrap.releaseExternalResources() + } { + // Release the selectors, but don't try to kill the dispatcher + if (UseDispatcherForIo.isDefined) inboundBootstrap.shutdown() + else inboundBootstrap.releaseExternalResources() + } }