From c43ce95bd4fba8ea0eab8fa6d19b69cc7b17ea39 Mon Sep 17 00:00:00 2001 From: Mathias Date: Tue, 2 Apr 2013 16:39:21 +0200 Subject: [PATCH] Small simplification in TcpConnection --- akka-actor/src/main/scala/akka/io/TcpConnection.scala | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/akka-actor/src/main/scala/akka/io/TcpConnection.scala b/akka-actor/src/main/scala/akka/io/TcpConnection.scala index c209421a87..2353453505 100644 --- a/akka-actor/src/main/scala/akka/io/TcpConnection.scala +++ b/akka-actor/src/main/scala/akka/io/TcpConnection.scala @@ -51,7 +51,7 @@ private[io] abstract class TcpConnection(val channel: SocketChannel, context.become(connected(handler)) case cmd: CloseCommand ⇒ - handleClose(commander, Some(sender), closeResponse(cmd)) + handleClose(commander, Some(sender), cmd.event) case ReceiveTimeout ⇒ // after sending `Register` user should watch this actor to make sure @@ -80,7 +80,7 @@ private[io] abstract class TcpConnection(val channel: SocketChannel, case ChannelWritable ⇒ if (writePending) doWrite(handler) - case cmd: CloseCommand ⇒ handleClose(handler, Some(sender), closeResponse(cmd)) + case cmd: CloseCommand ⇒ handleClose(handler, Some(sender), cmd.event) } /** connection is closing but a write has to be finished first */ @@ -225,13 +225,6 @@ private[io] abstract class TcpConnection(val channel: SocketChannel, context.stop(self) } - def closeResponse(closeCommand: CloseCommand): ConnectionClosed = - closeCommand match { - case Close ⇒ Closed - case Abort ⇒ Aborted - case ConfirmedClose ⇒ ConfirmedClosed - } - def handleError(handler: ActorRef, exception: IOException): Unit = { closedMessage = CloseInformation(Set(handler), ErrorClosed(extractMsg(exception)))