Change socket options type from immutable.Traversable to Traversable

The problem with `immutable.Traversable` is that it doesn't allow the use of `Seq.apply` for socket options, since `Seq` is aliased to `scala.collection.Seq` and not `scala.collection.immutable.Seq` in `package object scala`. Even though technically nicer `immutable.Traversable` therefore hinders usability of the API, for a benefit that we don't consider worth the cost.

Conflicts:
	akka-io/src/main/scala/akka/io/TcpConnection.scala
This commit is contained in:
Mathias 2013-01-21 17:02:20 +01:00
parent a53848edfa
commit ba922fa2d7
5 changed files with 10 additions and 9 deletions

View file

@ -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(