From 64d832377bb4a451acd7ea3f3ad3bf1c911edb9c Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Tue, 22 Jan 2013 16:05:03 +0100 Subject: [PATCH] prevent connection leak when temporaryServerAddress throws --- akka-io/src/test/scala/akka/io/TestUtils.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/akka-io/src/test/scala/akka/io/TestUtils.scala b/akka-io/src/test/scala/akka/io/TestUtils.scala index d084060dc1..8c33c2d938 100644 --- a/akka-io/src/test/scala/akka/io/TestUtils.scala +++ b/akka-io/src/test/scala/akka/io/TestUtils.scala @@ -13,10 +13,11 @@ object TestUtils { def temporaryServerAddress(address: String = "127.0.0.1"): InetSocketAddress = { val serverSocket = ServerSocketChannel.open() - serverSocket.socket.bind(new InetSocketAddress(address, 0)) - val port = serverSocket.socket.getLocalPort - serverSocket.close() - new InetSocketAddress(address, port) + try { + serverSocket.socket.bind(new InetSocketAddress(address, 0)) + val port = serverSocket.socket.getLocalPort + new InetSocketAddress(address, port) + } finally serverSocket.close() } def verifyActorTermination(actor: ActorRef)(implicit system: ActorSystem): Unit = {