From 4994b13fd5c69c014935d0e394e674bd2b1d0b29 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Wed, 29 Dec 2010 18:22:36 +0100 Subject: [PATCH] Removed if statement because it looked ugly --- .../main/scala/akka/remote/NettyRemoteSupport.scala | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/NettyRemoteSupport.scala index 3b98836f5f..b79bc696a1 100644 --- a/akka-remote/src/main/scala/akka/remote/NettyRemoteSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/NettyRemoteSupport.scala @@ -83,9 +83,7 @@ trait NettyRemoteClientModule extends RemoteClientModule { self: ListenerManagem def shutdownClientConnection(address: InetSocketAddress): Boolean = synchronized { remoteClients.remove(makeKey(address)) match { - case Some(client) => - client.shutdown - true + case Some(client) => client.shutdown case None => false } } @@ -133,9 +131,9 @@ trait NettyRemoteClientModule extends RemoteClientModule { self: ListenerManagem } object RemoteClient { - val SECURE_COOKIE: Option[String] = { - val cookie = config.getString("akka.remote.secure-cookie", "") - if (cookie == "") None else Some(cookie) + val SECURE_COOKIE: Option[String] = config.getString("akka.remote.secure-cookie", "") match { + case "" => None + case cookie => Some(cookie) } val READ_TIMEOUT = Duration(config.getInt("akka.remote.client.read-timeout", 1), TIME_UNIT)