From 4c9d1760a1b0c58da9b565a3678bb83d0b069f02 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 24 Sep 2012 13:15:58 +0200 Subject: [PATCH] Don't await the write of shutdownSignal to openChannels when shutting netty, see #2535 * The multi node tests triggered shutdown ordering issue * Not necessary to awaitUninterruptibly for the shutdownSignal to openChannels --- akka-remote/src/main/scala/akka/remote/netty/Server.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-remote/src/main/scala/akka/remote/netty/Server.scala b/akka-remote/src/main/scala/akka/remote/netty/Server.scala index 895fea9212..16269a43a2 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/Server.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/Server.scala @@ -72,7 +72,7 @@ private[akka] class NettyRemoteServer(val netty: NettyRemoteTransport) { b.setCookie(settings.SecureCookie.get) b.build } - openChannels.write(netty.createControlEnvelope(shutdownSignal)).awaitUninterruptibly + openChannels.write(netty.createControlEnvelope(shutdownSignal)) openChannels.disconnect openChannels.close.awaitUninterruptibly bootstrap.releaseExternalResources()