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

also fix FlowInterleaveSpec

Browse source 
Also-by: Johan Andrén <johan@markatta.com>
Also-by: Roland Kuhn <rk@rkuhn.info>
Also-by: Martynas Mickevičius <mmartynas@gmail.com>
This commit is contained in:
Endre Sándor Varga 2016-01-20 10:00:37 +02:00 • committed by Martynas Mickevičius
parent ef77b56e66
commit 60497f6561
195 changed files with 1110 additions and 857 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala
View file

@ -5,6 +5,7 @@ package akka.stream.impl
import java.util.concurrent.atomic.{ AtomicInteger, AtomicReference }
import java.{ util ⇒ ju }
import akka.NotUsed
import akka.stream.impl.MaterializerSession.MaterializationPanic
import akka.stream.impl.StreamLayout.Module
import akka.stream.impl.fusing.GraphStages.MaterializedValueSource
@ -676,7 +677,7 @@ private[stream] abstract class MaterializerSession(val topLevel: StreamLayout.Mo
case Atomic(m) ⇒ matVal.get(m)
case Combine(f, d1, d2) ⇒ f(resolveMaterialized(d1, matVal, indent + " "), resolveMaterialized(d2, matVal, indent + " "))
case Transform(f, d) ⇒ f(resolveMaterialized(d, matVal, indent + " "))
case Ignore ⇒ ()
case Ignore ⇒ NotUsed
}
if (MaterializerSession.Debug) println(indent + s"result = $ret")
matValSrc.remove(matNode) match {