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

Merge pull request #1096 from akka/wip-2986-ActorContext-executor-√

Browse source 
#2986 - Changing ActorContext and ActorRefFactory's dispatcher to retur...
This commit is contained in:
Viktor Klang (√) 2013-01-31 06:42:12 -08:00
commit 5164e2e08e
20 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
View file

@ -10,10 +10,10 @@ import akka.event.{ Logging, LoggingAdapter, EventStream }
import akka.event.Logging.Error
import akka.serialization.{ JavaSerializer, Serialization, SerializationExtension }
import akka.pattern.pipe
import scala.concurrent.Future
import scala.util.control.NonFatal
import akka.actor.SystemGuardian.{ TerminationHookDone, TerminationHook, RegisterTerminationHook }
import scala.util.control.Exception.Catcher
import scala.concurrent.{ ExecutionContext, Future }
object RemoteActorRefProvider {
private case class Internals(transport: RemoteTransport, serialization: Serialization, remoteDaemon: InternalActorRef)
@ -127,7 +127,7 @@ class RemoteActorRefProvider(
override def guardian: LocalActorRef = local.guardian
override def systemGuardian: LocalActorRef = local.systemGuardian
override def terminationFuture: Future[Unit] = local.terminationFuture
override def dispatcher: MessageDispatcher = local.dispatcher
override def dispatcher: ExecutionContext = local.dispatcher
override def registerTempActor(actorRef: InternalActorRef, path: ActorPath): Unit = local.registerTempActor(actorRef, path)
override def unregisterTempActor(path: ActorPath): Unit = local.unregisterTempActor(path)
override def tempPath(): ActorPath = local.tempPath()