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

Update to a working version of Scalariform

Browse source
This commit is contained in:
Björn Antonsson 2016-06-02 14:06:57 +02:00
parent cae070bd93
commit c66ce62d63
616 changed files with 5966 additions and 5436 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,12 +26,13 @@ import akka.stream.impl.fusing.GraphInterpreterShell
/**
* INTERNAL API
*/
private[akka] case class ActorMaterializerImpl(system: ActorSystem,
override val settings: ActorMaterializerSettings,
dispatchers: Dispatchers,
supervisor: ActorRef,
haveShutDown: AtomicBoolean,
flowNames: SeqActorName) extends ActorMaterializer {
private[akka] case class ActorMaterializerImpl(
system: ActorSystem,
override val settings: ActorMaterializerSettings,
dispatchers: Dispatchers,
supervisor: ActorRef,
haveShutDown: AtomicBoolean,
flowNames: SeqActorName) extends ActorMaterializer {
import akka.stream.impl.Stages._
private val _logger = Logging.getLogger(system, this)
override def logger = _logger
@ -78,8 +79,9 @@ private[akka] case class ActorMaterializerImpl(system: ActorSystem,
override def materialize[Mat](_runnableGraph: Graph[ClosedShape, Mat]): Mat =
materialize(_runnableGraph, null)
private[stream] def materialize[Mat](_runnableGraph: Graph[ClosedShape, Mat],
subflowFuser: GraphInterpreterShell ⇒ ActorRef): Mat = {
private[stream] def materialize[Mat](
_runnableGraph: Graph[ClosedShape, Mat],
subflowFuser: GraphInterpreterShell ⇒ ActorRef): Mat = {
val runnableGraph =
if (settings.autoFusing) Fusing.aggressive(_runnableGraph)
else _runnableGraph
@ -142,7 +144,8 @@ private[akka] case class ActorMaterializerImpl(system: ActorSystem,
case stage: GraphStageModule ⇒
val graph =
GraphModule(GraphAssembly(stage.shape.inlets, stage.shape.outlets, stage.stage),
GraphModule(
GraphAssembly(stage.shape.inlets, stage.shape.outlets, stage.stage),
stage.shape, stage.attributes, Array(stage))
matGraph(graph, effectiveAttributes, matVal)
}