Merge pull request #1457 from akka/wip-3345-not-closing-testconductor-on-netty-thread-√

#3345 - making sure not to close the Netty Bootstrap on the Netty IO th...

akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala

@@ -317,7 +317,7 @@ private[akka] class PlayerHandler(
     val channel = event.getChannel
     log.debug("disconnected from {}", getAddrString(channel))
     fsm ! PoisonPill
-    RemoteConnection.shutdown(channel)
+    executor.execute(new Runnable { def run = RemoteConnection.shutdown(channel) }) // Must be shutdown outside of the Netty IO pool
   }
 
   override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) = {

akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala

@@ -71,7 +71,6 @@ private[akka] object RemoteConnection {
     case _                    ⇒ "[unknown]"
   }
 
-  def shutdown(channel: Channel) = {
-    channel.getFactory.releaseExternalResources()
-  }
+  def shutdown(channel: Channel) =
+    try channel.close() finally try channel.getFactory.shutdown() finally channel.getFactory.releaseExternalResources()
 }