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

!str - 18608 - Moves the a.s.io.Timeouts functionality into Source/Flow/BidiFlow

Browse source
This commit is contained in:
Viktor Klang 2015-11-01 13:13:35 +01:00
parent 06ce968b16
commit bbb942d44e
10 changed files with 128 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala
View file

@ -13,7 +13,6 @@ import akka.stream.impl.ReactiveStreamsCompliance._
import akka.stream.impl.StreamLayout.Module
import akka.stream.impl._
import akka.stream.impl.io.{ DelayedInitProcessor, StreamTcpManager }
import akka.stream.io.Timeouts
import akka.util.ByteString
import org.reactivestreams.{ Processor, Publisher, Subscriber }
@ -204,7 +203,7 @@ class Tcp(system: ExtendedActorSystem) extends akka.actor.Extension {
idleTimeout: Duration = Duration.Inf): Flow[ByteString, ByteString, Future[OutgoingConnection]] = {
val timeoutHandling = idleTimeout match {
case d: FiniteDuration ⇒ Flow[ByteString].join(Timeouts.idleTimeoutBidi[ByteString, ByteString](d))
case d: FiniteDuration ⇒ Flow[ByteString].join(BidiFlow.bidirectionalIdleTimeout[ByteString, ByteString](d))
case _ ⇒ Flow[ByteString]
}