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

+str #16105 Java API for FlexiMerge

Browse source
This commit is contained in:
Patrik Nordwall 2014-11-04 14:02:35 +01:00
parent 3d134af562
commit 30ee5539b8
5 changed files with 635 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,8 +109,9 @@ private[akka] object Ast {
override def name = "concat"
}
case class FlexiMergeNode(merger: FlexiMerge[Any]) extends FanInAstNode {
override def name = merger.name.getOrElse("flexMerge")
case class FlexiMergeNode(merger: FlexiMergeImpl.MergeLogicFactory[Any]) extends FanInAstNode {
override def name = merger.name.getOrElse("flexiMerge")
}
case class RouteNode(route: FlexiRoute[Any]) extends FanOutAstNode {