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

=str make StageActorRef "single" and watchable, fix some tests

Browse source
This commit is contained in:
Konrad Malawski 2015-11-23 15:57:09 +01:00
parent df93b2f883
commit 7afb750380
15 changed files with 556 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.{ AtomicInteger, AtomicBoolean }
import akka.actor.{ ActorContext, ActorRef, ActorRefFactory, ActorSystem, ExtendedActorSystem, Props }
import akka.event.LoggingAdapter
import akka.stream.impl._
import com.typesafe.config.Config
@ -59,7 +60,7 @@ object ActorMaterializer {
system.dispatchers,
context.actorOf(StreamSupervisor.props(materializerSettings, haveShutDown).withDispatcher(materializerSettings.dispatcher), StreamSupervisor.nextName()),
haveShutDown,
FlowNames(system).names.copy(namePrefix))
FlowNames(system).name.copy(namePrefix))
}
/**
@ -169,6 +170,11 @@ abstract class ActorMaterializer extends Materializer {
*/
private[akka] def system: ActorSystem
/**
* INTERNAL API
*/
private[akka] def logger: LoggingAdapter
/** INTERNAL API */
private[akka] def supervisor: ActorRef