From 74f544570898e21eb5b911217caa397051036be6 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 14 Dec 2010 18:57:45 +0100 Subject: [PATCH] Switch to a match instead of a not-so-cute if --- .../src/main/scala/akka/remote/RemoteServer.scala | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/RemoteServer.scala b/akka-remote/src/main/scala/akka/remote/RemoteServer.scala index 1ec427d0ab..b8e55c8054 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteServer.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteServer.scala @@ -485,14 +485,12 @@ class RemoteServerHandler( super.handleUpstream(ctx, event) } - override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) = { - val message = event.getMessage - if (message eq null) throw new IllegalActorStateException("Message in remote MessageEvent is null: " + event) - if (message.isInstanceOf[RemoteMessageProtocol]) { - val requestProtocol = message.asInstanceOf[RemoteMessageProtocol] - if (RemoteServer.REQUIRE_COOKIE) authenticateRemoteClient(requestProtocol, ctx) + override def messageReceived(ctx: ChannelHandlerContext, event: MessageEvent) = event.getMessage match { + case null => throw new IllegalActorStateException("Message in remote MessageEvent is null: " + event) + case requestProtocol: RemoteMessageProtocol => + if (RemoteServer.REQUIRE_COOKIE) authenticateRemoteClient(requestProtocol, ctx) handleRemoteMessageProtocol(requestProtocol, event.getChannel) - } + case _ => //ignore } override def exceptionCaught(ctx: ChannelHandlerContext, event: ExceptionEvent) = {