Merge pull request #19396 from akka/wip-18948-eagerComplete-RK

#18948 add eagerComplete parameter to FlowOps.merge
This commit is contained in:
Roland Kuhn 2016-01-11 15:42:59 +01:00
commit 72eb3f539d
8 changed files with 67 additions and 40 deletions

View file

@ -68,7 +68,7 @@ private object PoolConductor {
GraphDSL.create() { implicit b
import GraphDSL.Implicits._
val retryMerge = b.add(MergePreferred[RequestContext](1, eagerClose = true))
val retryMerge = b.add(MergePreferred[RequestContext](1, eagerComplete = true))
val slotSelector = b.add(new SlotSelector(slotCount, pipeliningLimit, log))
val route = b.add(new Route(slotCount))
val retrySplit = b.add(Broadcast[RawSlotEvent](2))