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

Revert "=str #16280 Make flows sharable again" since the problem is solved differently in this branch.

Browse source 
This reverts commit 2af568eb7a0c8d65f3dd2bb04852d05d5cbda416.
This commit is contained in:
Viktor Klang 2014-11-12 14:26:10 +01:00
parent af3d9860dd
commit efe9331b69
4 changed files with 21 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-stream/src/main/scala/akka/stream/impl/ActorBasedFlowMaterializer.scala
View file

@ -43,12 +43,7 @@ private[akka] object Ast {
case class TimerTransform(name: String, mkTransformer: () ⇒ TimerTransformer[Any, Any]) extends AstNode
object OpFactory {
def apply(mkOp: () ⇒ Op[_, _, _, _, _], name: String): OpFactory =
OpFactory(List(mkOp), name)
}
case class OpFactory(mkOps: List[() ⇒ Op[_, _, _, _, _]], name: String) extends AstNode
case class Fusable(ops: immutable.Seq[Op[_, _, _, _, _]], name: String) extends AstNode
case class MapAsync(f: Any ⇒ Future[Any]) extends AstNode {
override def name = "mapAsync"
@ -331,7 +326,7 @@ private[akka] object ActorProcessorFactory {
def props(materializer: FlowMaterializer, op: AstNode): Props = {
val settings = materializer.settings
(op match {
case OpFactory(mkOps, _) ⇒ Props(new ActorInterpreter(materializer.settings, mkOps.map(_.apply())))
case Fusable(ops, _) ⇒ Props(new ActorInterpreter(materializer.settings, ops))
case t: Transform ⇒ Props(new TransformProcessorImpl(settings, t.mkTransformer()))
case t: TimerTransform ⇒ Props(new TimerTransformerProcessorsImpl(settings, t.mkTransformer()))
case m: MapAsync ⇒ Props(new MapAsyncProcessorImpl(settings, m.f))