raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Revert "Change socket options type from immutable.Traversable to Traversable"

Browse source 
This reverts commit ba922fa2d7.

Conflicts:
	akka-io/src/main/scala/akka/io/Tcp.scala
	akka-io/src/main/scala/akka/io/TcpIncomingConnection.scala
	akka-io/src/main/scala/akka/io/TcpListener.scala
	akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala
This commit is contained in:
Johannes Rudolph 2013-01-22 16:03:22 +01:00
parent c6265843b3
commit fccf596649
7 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-io/src/main/scala/akka/io/Tcp.scala
View file

@ -132,11 +132,11 @@ object Tcp extends ExtensionKey[TcpExt] {
case class Connect(remoteAddress: InetSocketAddress,
localAddress: Option[InetSocketAddress] = None,
options: Traversable[SocketOption] = Nil) extends Command
options: immutable.Traversable[SocketOption] = Nil) extends Command
case class Bind(handler: ActorRef,
endpoint: InetSocketAddress,
backlog: Int = 100,
options: Traversable[SocketOption] = Nil) extends Command
options: immutable.Traversable[SocketOption] = Nil) extends Command
case class Register(handler: ActorRef) extends Command
case object Unbind extends Command

3
akka-io/src/main/scala/akka/io/TcpConnection.scala
View file

@ -9,6 +9,7 @@ import java.io.IOException
import java.nio.channels.SocketChannel
import java.nio.ByteBuffer
import scala.annotation.tailrec
import scala.collection.immutable
import scala.util.control.NonFatal
import scala.concurrent.duration._
import akka.actor._
@ -102,7 +103,7 @@ private[io] abstract class TcpConnection(val channel: SocketChannel,
// AUXILIARIES and IMPLEMENTATION
/** used in subclasses to start the common machinery above once a channel is connected */
def completeConnect(commander: ActorRef, options: Traversable[SocketOption]): Unit = {
def completeConnect(commander: ActorRef, options: immutable.Traversable[SocketOption]): Unit = {
options.foreach(_.afterConnect(channel.socket))
commander ! Connected(

3
akka-io/src/main/scala/akka/io/TcpIncomingConnection.scala
View file

@ -5,6 +5,7 @@
package akka.io
import java.nio.channels.SocketChannel
import scala.collection.immutable
import akka.actor.ActorRef
import Tcp.SocketOption
@ -15,7 +16,7 @@ import Tcp.SocketOption
private[io] class TcpIncomingConnection(_channel: SocketChannel,
_tcp: TcpExt,
handler: ActorRef,
options: Traversable[SocketOption])
options: immutable.Traversable[SocketOption])
extends TcpConnection(_channel, _tcp) {
context.watch(handler) // sign death pact

3
akka-io/src/main/scala/akka/io/TcpListener.scala
View file

@ -7,6 +7,7 @@ package akka.io
import java.net.InetSocketAddress
import java.nio.channels.ServerSocketChannel
import scala.annotation.tailrec
import scala.collection.immutable
import scala.util.control.NonFatal
import akka.actor.{ ActorLogging, ActorRef, Actor }
import TcpSelector._
@ -17,7 +18,7 @@ private[io] class TcpListener(handler: ActorRef,
backlog: Int,
bindCommander: ActorRef,
settings: TcpExt#Settings,
options: Traversable[SocketOption]) extends Actor with ActorLogging {
options: immutable.Traversable[SocketOption]) extends Actor with ActorLogging {
def selector: ActorRef = context.parent

5
akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala
View file

@ -7,6 +7,7 @@ package akka.io
import java.net.InetSocketAddress
import java.io.IOException
import java.nio.channels.SocketChannel
import scala.collection.immutable
import akka.actor.ActorRef
import TcpSelector._
import Tcp._
@ -19,7 +20,7 @@ private[io] class TcpOutgoingConnection(_tcp: TcpExt,
commander: ActorRef,
remoteAddress: InetSocketAddress,
localAddress: Option[InetSocketAddress],
options: Traversable[SocketOption])
options: immutable.Traversable[SocketOption])
extends TcpConnection(TcpOutgoingConnection.newSocketChannel(), _tcp) {
context.watch(commander) // sign death pact
@ -37,7 +38,7 @@ private[io] class TcpOutgoingConnection(_tcp: TcpExt,
def receive: Receive = PartialFunction.empty
def connecting(commander: ActorRef, options: Traversable[SocketOption]): Receive = {
def connecting(commander: ActorRef, options: immutable.Traversable[SocketOption]): Receive = {
case ChannelConnectable ⇒
try {
val connected = channel.finishConnect()

5
akka-io/src/main/scala/akka/io/TcpSelector.scala
View file

@ -9,7 +9,8 @@ import java.nio.channels.spi.SelectorProvider
import java.nio.channels.{ ServerSocketChannel, SelectionKey, SocketChannel }
import java.nio.channels.SelectionKey._
import scala.util.control.NonFatal
import scala.collection.immutable.HashMap
import scala.collection.immutable
import immutable.HashMap
import scala.concurrent.duration._
import akka.actor._
import Tcp._
@ -229,7 +230,7 @@ private[io] object TcpSelector {
case class RegisterOutgoingConnection(channel: SocketChannel)
case class RegisterServerSocketChannel(channel: ServerSocketChannel)
case class RegisterIncomingConnection(channel: SocketChannel, handler: ActorRef,
options: Traversable[SocketOption]) extends Tcp.Command
options: immutable.Traversable[SocketOption]) extends Tcp.Command
case class Retry(command: Command, retriesLeft: Int) { require(retriesLeft >= 0) }
case object ChannelConnectable

5
akka-io/src/test/scala/akka/io/IntegrationSpecSupport.scala
View file

@ -7,6 +7,7 @@ package akka.io
import scala.annotation.tailrec
import akka.testkit.{ AkkaSpec, TestProbe }
import akka.actor.ActorRef
import scala.collection.immutable
import Tcp._
import TestUtils._
@ -45,10 +46,10 @@ trait IntegrationSpecSupport { _: AkkaSpec ⇒
}
/** allow overriding socket options for server side channel */
def bindOptions: Traversable[SocketOption] = Nil
def bindOptions: immutable.Traversable[SocketOption] = Nil
/** allow overriding socket options for client side channel */
def connectOptions: Traversable[SocketOption] = Nil
def connectOptions: immutable.Traversable[SocketOption] = Nil
}
}