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

=str #19067: Fixed error reporting after stage is closed.

Browse source
This commit is contained in:
Endre Sándor Varga 2015-12-14 16:42:43 +01:00
parent 3d20915cf4
commit 6b4a4848c9
6 changed files with 50 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala
View file

@ -521,7 +521,7 @@ private[stream] final class GraphInterpreter(
catch {
case NonFatal(e) ⇒
if (activeStage == null) throw e
else activeStage.failStage(e)
else activeStage.failStage(e, isInternal = true)
}
afterStageHasRun(activeStage)
eventsRemaining -= 1
@ -671,13 +671,16 @@ private[stream] final class GraphInterpreter(
if ((currentState & OutClosed) == 0) completeConnection(assembly.outOwners(connection))
}
private[stream] def fail(connection: Int, ex: Throwable): Unit = {
private[stream] def fail(connection: Int, ex: Throwable, isInternal: Boolean): Unit = {
val currentState = portStates(connection)
if (Debug) println(s"$Name fail($connection, $ex) [$currentState]")
portStates(connection) = currentState | (OutClosed | InFailed)
if ((currentState & InClosed) == 0) {
portStates(connection) = currentState | OutClosed
if ((currentState & (InClosed | OutClosed)) == 0) {
portStates(connection) = currentState | (OutClosed | InFailed)
connectionSlots(connection) = Failed(ex, connectionSlots(connection))
if ((currentState & (Pulling | Pushing)) == 0) enqueue(connection)
} else if (isInternal) {
log.error(ex, "Error after stage was closed.")
}
if ((currentState & OutClosed) == 0) completeConnection(assembly.outOwners(connection))
}