From efaef76444afaf991bf0544962d9e199ad4b504b Mon Sep 17 00:00:00 2001 From: Mathias Date: Thu, 11 Apr 2013 14:33:41 +0200 Subject: [PATCH] Some cleanup --- akka-actor/src/main/scala/akka/io/TcpListener.scala | 2 -- akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala | 2 +- akka-actor/src/main/scala/akka/io/UdpConnection.scala | 6 +++--- akka-actor/src/main/scala/akka/io/UdpSender.scala | 6 ------ 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/akka-actor/src/main/scala/akka/io/TcpListener.scala b/akka-actor/src/main/scala/akka/io/TcpListener.scala index 980bb18c8f..30baaa4c06 100644 --- a/akka-actor/src/main/scala/akka/io/TcpListener.scala +++ b/akka-actor/src/main/scala/akka/io/TcpListener.scala @@ -32,8 +32,6 @@ private[io] class TcpListener(val selectorRouter: ActorRef, val tcp: TcpExt, val bindCommander: ActorRef, val bind: Bind) extends Actor with ActorLogging { - - def selector: ActorRef = context.parent import TcpListener._ import tcp.Settings._ import bind._ diff --git a/akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala b/akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala index 284d1b9679..70ef39d5e3 100644 --- a/akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala +++ b/akka-actor/src/main/scala/akka/io/UdpConnectedManager.scala @@ -15,7 +15,7 @@ private[io] class UdpConnectedManager(udpConn: UdpConnectedExt) extends Selector def receive = workerForCommandHandler { case c: Connect ⇒ val commander = sender - Props(new UdpConnectedection(udpConn, commander, c)) + Props(new UdpConnection(udpConn, commander, c)) } } diff --git a/akka-actor/src/main/scala/akka/io/UdpConnection.scala b/akka-actor/src/main/scala/akka/io/UdpConnection.scala index 8e7869a53c..6beded47c8 100644 --- a/akka-actor/src/main/scala/akka/io/UdpConnection.scala +++ b/akka-actor/src/main/scala/akka/io/UdpConnection.scala @@ -16,9 +16,9 @@ import scala.util.control.NonFatal /** * INTERNAL API */ -private[io] class UdpConnectedection(val udpConn: UdpConnectedExt, - val commander: ActorRef, - val connect: Connect) extends Actor with ActorLogging { +private[io] class UdpConnection(val udpConn: UdpConnectedExt, + val commander: ActorRef, + val connect: Connect) extends Actor with ActorLogging { def selector: ActorRef = context.parent diff --git a/akka-actor/src/main/scala/akka/io/UdpSender.scala b/akka-actor/src/main/scala/akka/io/UdpSender.scala index af3df740c5..5f45550591 100644 --- a/akka-actor/src/main/scala/akka/io/UdpSender.scala +++ b/akka-actor/src/main/scala/akka/io/UdpSender.scala @@ -12,8 +12,6 @@ import akka.io.Inet.SocketOption import scala.util.control.NonFatal /** - * Base class for TcpIncomingConnection and TcpOutgoingConnection. - * * INTERNAL API */ private[io] class UdpSender(val udp: UdpExt, options: immutable.Traversable[SocketOption], val commander: ActorRef) @@ -45,9 +43,5 @@ private[io] class UdpSender(val udp: UdpExt, options: immutable.Traversable[Sock case NonFatal(e) ⇒ log.error(e, "Error closing DatagramChannel") } } - - override def postRestart(reason: Throwable): Unit = - throw new IllegalStateException("Restarting not supported for connection actors.") - }