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

Propagate downstream cancellation failures (#27547)

Browse source 
* Add doc clarification about IOResult on sources
* Better error message for IOOperationIncompleteException

Co-Authored-By: Johannes Rudolph <johannes.rudolph@gmail.com>
This commit is contained in:
Johan Andrén 2019-09-05 20:55:48 +02:00 • committed by Patrik Nordwall
parent 4020036eb6
commit ed955e0da4
40 changed files with 345 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala
View file

@ -1996,7 +1996,7 @@ private[stream] object Collect {
val outHandler = new OutHandler {
override def onPull(): Unit = sinkIn.pull()
override def onDownstreamFinish(): Unit = sinkIn.cancel()
override def onDownstreamFinish(cause: Throwable): Unit = sinkIn.cancel(cause)
}
Source.fromGraph(source).runWith(sinkIn.sink)(interpreter.subFusingMaterializer)
@ -2218,8 +2218,8 @@ private[stream] object Collect {
override def onPull(): Unit = {
subInlet.pull()
}
override def onDownstreamFinish(): Unit = {
subInlet.cancel()
override def onDownstreamFinish(cause: Throwable): Unit = {
subInlet.cancel(cause)
maybeCompleteStage()
}
})
@ -2240,9 +2240,9 @@ private[stream] object Collect {
}
}
}
override def onDownstreamFinish(): Unit = {
override def onDownstreamFinish(cause: Throwable): Unit = {
if (!isClosed(in)) {
cancel(in)
cancel(in, cause)
}
maybeCompleteStage()
}