Substream materialization failure test coverage and fix #22646

2017-04-03 20:21:02 +02:00 · 2017-04-03 20:21:02 +02:00 · d5459222aa
commit d5459222aa
parent fcbda8157f
6 changed files with 92 additions and 8 deletions
--- a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala
+++ b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala
@ -552,7 +552,14 @@ import akka.util.OptionVal
        }

        switchToFirstElementHandlers()
-        promise.trySuccess(Source.fromGraph(sourceOut.source).runWith(sink)(interpreter.subFusingMaterializer))
+        try {
+          val matVal = Source.fromGraph(sourceOut.source).runWith(sink)(interpreter.subFusingMaterializer)
+          promise.trySuccess(matVal)
+        } catch {
+          case NonFatal(ex) ⇒
+            promise.tryFailure(ex)
+            failStage(ex)
+        }
      }

    }