diff --git a/akka-io/src/main/scala/akka/io/Tcp.scala b/akka-io/src/main/scala/akka/io/Tcp.scala index 7bb13987d3..7df771caf1 100644 --- a/akka-io/src/main/scala/akka/io/Tcp.scala +++ b/akka-io/src/main/scala/akka/io/Tcp.scala @@ -132,11 +132,11 @@ object Tcp extends ExtensionKey[TcpExt] { case class Connect(remoteAddress: InetSocketAddress, localAddress: Option[InetSocketAddress] = None, - options: immutable.Traversable[SocketOption] = Nil) extends Command + options: Traversable[SocketOption] = Nil) extends Command case class Bind(handler: ActorRef, endpoint: InetSocketAddress, backlog: Int = 100, - options: immutable.Traversable[SocketOption] = Nil) extends Command + options: Traversable[SocketOption] = Nil) extends Command case class Register(handler: ActorRef) extends Command case object Unbind extends Command @@ -185,7 +185,7 @@ object Tcp extends ExtensionKey[TcpExt] { case class RegisterOutgoingConnection(channel: SocketChannel) case class RegisterServerSocketChannel(channel: ServerSocketChannel) case class RegisterIncomingConnection(channel: SocketChannel, handler: ActorRef, - options: immutable.Traversable[SocketOption]) extends Command + options: Traversable[SocketOption]) extends Command case class Retry(command: Command, retriesLeft: Int) { require(retriesLeft >= 0) } case object ChannelConnectable case object ChannelAcceptable diff --git a/akka-io/src/main/scala/akka/io/TcpConnection.scala b/akka-io/src/main/scala/akka/io/TcpConnection.scala index b08ba8df48..632b28bd59 100644 --- a/akka-io/src/main/scala/akka/io/TcpConnection.scala +++ b/akka-io/src/main/scala/akka/io/TcpConnection.scala @@ -100,8 +100,8 @@ abstract class TcpConnection(val selector: ActorRef, // AUXILIARIES and IMPLEMENTATION - /** use in subclasses to start the common machinery above once a channel is connected */ - def completeConnect(commander: ActorRef, options: immutable.Traversable[SocketOption]): Unit = { + /** used in subclasses to start the common machinery above once a channel is connected */ + def completeConnect(commander: ActorRef, options: Traversable[SocketOption]): Unit = { options.foreach(_.afterConnect(channel.socket)) commander ! Connected( diff --git a/akka-io/src/main/scala/akka/io/TcpIncomingConnection.scala b/akka-io/src/main/scala/akka/io/TcpIncomingConnection.scala index 902dde0233..5a4a9a5d94 100644 --- a/akka-io/src/main/scala/akka/io/TcpIncomingConnection.scala +++ b/akka-io/src/main/scala/akka/io/TcpIncomingConnection.scala @@ -17,7 +17,7 @@ class TcpIncomingConnection(_selector: ActorRef, _channel: SocketChannel, _tcp: TcpExt, handler: ActorRef, - options: immutable.Traversable[SocketOption]) + options: Traversable[SocketOption]) extends TcpConnection(_selector, _channel, _tcp) { context.watch(handler) // sign death pact diff --git a/akka-io/src/main/scala/akka/io/TcpListener.scala b/akka-io/src/main/scala/akka/io/TcpListener.scala index 5bf456faf3..fac5b90c9c 100644 --- a/akka-io/src/main/scala/akka/io/TcpListener.scala +++ b/akka-io/src/main/scala/akka/io/TcpListener.scala @@ -18,7 +18,7 @@ class TcpListener(selector: ActorRef, backlog: Int, bindCommander: ActorRef, settings: TcpExt#Settings, - options: immutable.Traversable[SocketOption]) extends Actor with ActorLogging { + options: Traversable[SocketOption]) extends Actor with ActorLogging { context.watch(handler) // sign death pact val channel = { diff --git a/akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala b/akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala index b33e6605e8..fcaecc0bc4 100644 --- a/akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala +++ b/akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala @@ -20,7 +20,7 @@ class TcpOutgoingConnection(_selector: ActorRef, commander: ActorRef, remoteAddress: InetSocketAddress, localAddress: Option[InetSocketAddress], - options: immutable.Traversable[SocketOption]) + options: Traversable[SocketOption]) extends TcpConnection(_selector, TcpOutgoingConnection.newSocketChannel(), _tcp) { context.watch(commander) // sign death pact @@ -34,11 +34,12 @@ class TcpOutgoingConnection(_selector: ActorRef, else { selector ! RegisterOutgoingConnection(channel) context.become(connecting(commander, options)) + Seq(1,2,3) } def receive: Receive = PartialFunction.empty - def connecting(commander: ActorRef, options: immutable.Traversable[SocketOption]): Receive = { + def connecting(commander: ActorRef, options: Traversable[SocketOption]): Receive = { case ChannelConnectable ⇒ try { val connected = channel.finishConnect()