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

Mini cleanup to stream.ActorMaterializer (#25866)

Browse source 
Do it once, instead of in all 4 call sites.
This commit is contained in:
Dale Wijnand 2018-11-05 13:10:54 +00:00 • committed by Johan Andrén
parent 079aa46733
commit 91101d996c
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala
View file

@ -67,14 +67,13 @@ object ActorMaterializer {
FlowNames(system).name.copy(namePrefix))
}
private def actorOfStreamSupervisor(materializerSettings: ActorMaterializerSettings, context: ActorRefFactory, haveShutDown: AtomicBoolean) =
private def actorOfStreamSupervisor(materializerSettings: ActorMaterializerSettings, context: ActorRefFactory, haveShutDown: AtomicBoolean) = {
val props = StreamSupervisor.props(materializerSettings, haveShutDown)
context match {
case s: ExtendedActorSystem ⇒
s.systemActorOf(StreamSupervisor.props(materializerSettings, haveShutDown).withDispatcher(materializerSettings.dispatcher), StreamSupervisor.nextName())
case a: ActorContext ⇒
a.actorOf(StreamSupervisor.props(materializerSettings, haveShutDown).withDispatcher(materializerSettings.dispatcher), StreamSupervisor.nextName())
case s: ExtendedActorSystem ⇒ s.systemActorOf(props, StreamSupervisor.nextName())
case a: ActorContext ⇒ a.actorOf(props, StreamSupervisor.nextName())
}
}
/**
* Scala API: Creates an ActorMaterializer that can materialize stream blueprints as running streams.
@ -101,8 +100,9 @@ object ActorMaterializer {
system,
materializerSettings,
system.dispatchers,
system.systemActorOf(StreamSupervisor.props(materializerSettings, haveShutDown)
.withDispatcher(materializerSettings.dispatcher), StreamSupervisor.nextName()),
system.systemActorOf(
StreamSupervisor.props(materializerSettings, haveShutDown),
StreamSupervisor.nextName()),
haveShutDown,
FlowNames(system).name.copy(namePrefix))
}