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

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(