From aac7e7ad4a45e2fc80c1d2d9e1071df6cefa311e Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Sat, 23 Nov 2013 10:25:16 +0100 Subject: [PATCH] =act cleanup state parameters in TcpOutgoingConnection Backport of https://github.com/spray/spray/commit/c480208f5665842103ea6fc8a1b811af38d4a667 --- .../src/main/scala/akka/io/TcpOutgoingConnection.scala | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala index 9da5e23e62..61158cf4ee 100644 --- a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala +++ b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala @@ -55,13 +55,12 @@ private[io] class TcpOutgoingConnection(_tcp: TcpExt, completeConnect(registration, commander, options) else { registration.enableInterest(SelectionKey.OP_CONNECT) - context.become(connecting(registration, commander, options, tcp.Settings.FinishConnectRetries)) + context.become(connecting(registration, tcp.Settings.FinishConnectRetries)) } } } - def connecting(registration: ChannelRegistration, commander: ActorRef, - options: immutable.Traversable[SocketOption], remainingFinishConnectRetries: Int): Receive = { + def connecting(registration: ChannelRegistration, remainingFinishConnectRetries: Int): Receive = { { case ChannelConnectable ⇒ reportConnectFailure { @@ -74,7 +73,7 @@ private[io] class TcpOutgoingConnection(_tcp: TcpExt, context.system.scheduler.scheduleOnce(1.millisecond) { channelRegistry.register(channel, SelectionKey.OP_CONNECT) }(context.dispatcher) - context.become(connecting(registration, commander, options, remainingFinishConnectRetries - 1)) + context.become(connecting(registration, remainingFinishConnectRetries - 1)) } else { log.debug("Could not establish connection because finishConnect " + "never returned true (consider increasing akka.io.tcp.finish-connect-retries)")