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

Merge pull request #19880 from johanandren/wip-pr-19808-for-merge

Browse source 
Merge: isAvailable(out) implies nothing is pending
This commit is contained in:
Johan Andrén 2016-02-25 15:18:35 +01:00
commit b71d8add7d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala
View file

@ -71,10 +71,10 @@ final class Merge[T] private (val inputPorts: Int, val eagerComplete: Boolean) e
setHandler(i, new InHandler {
override def onPush(): Unit = {
if (isAvailable(out)) {
if (!pending) {
push(out, grab(i))
tryPull(i)
}
// isAvailable(out) implies !pending
// -> grab and push immediately
push(out, grab(i))
tryPull(i)
} else pendingQueue.enqueue(i)
}