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

Merge pull request #17998 from ktoso/agolubev-agolubev-#16965-UnzipWith-2.3-dev-based

Browse source 
Agolubev #16965 unzip with 2.3 dev based
This commit is contained in:
Konrad Malawski 2015-07-15 11:41:21 +02:00
commit 2c8919ce3f
14 changed files with 556 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala
View file

@ -10,6 +10,7 @@ import akka.dispatch.Dispatchers
import akka.pattern.ask
import akka.stream.actor.ActorSubscriber
import akka.stream.impl.GenJunctions.ZipWithModule
import akka.stream.impl.GenJunctions.UnzipWithModule
import akka.stream.impl.Junctions._
import akka.stream.impl.StreamLayout.Module
import akka.stream.impl.fusing.ActorInterpreter
@ -178,8 +179,8 @@ private[akka] case class ActorMaterializerImpl(
case BalanceModule(shape, waitForDownstreams, _) ⇒
(Balance.props(effectiveSettings, shape.outArray.size, waitForDownstreams), shape.in, shape.outArray.toSeq)
case UnzipModule(shape, _) ⇒
(Unzip.props(effectiveSettings), shape.in, shape.outlets)
case unzip: UnzipWithModule ⇒
(unzip.props(effectiveSettings), unzip.inPorts.head, unzip.shape.outlets)
}
val impl = actorOf(props, stageName(effectiveAttributes), effectiveSettings.dispatcher)
val size = outs.size