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

Merging in master, huge work trying to get things to compile, tests not green at this stage

Browse source
This commit is contained in:
Viktor Klang 2012-07-06 17:04:04 +02:00
commit ac5b5de90a
68 changed files with 3759 additions and 2144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,9 @@ package akka.remote
import akka.actor._
import akka.dispatch._
import akka.event.{ Logging, LoggingAdapter }
import akka.event.EventStream
import akka.serialization.Serialization
import akka.serialization.SerializationExtension
import akka.event.{ Logging, LoggingAdapter, EventStream }
import akka.serialization.{ Serialization, SerializationExtension }
import scala.concurrent.Future
/**
* Remote ActorRefProvider. Starts up actor on remote node and creates a RemoteActorRef representing it.
@ -38,7 +37,7 @@ private[akka] class RemoteActorRefProvider(
override def rootGuardian: InternalActorRef = local.rootGuardian
override def guardian: LocalActorRef = local.guardian
override def systemGuardian: LocalActorRef = local.systemGuardian
override def terminationFuture: Promise[Unit] = local.terminationFuture
override def terminationFuture: Future[Unit] = local.terminationFuture
override def dispatcher: MessageDispatcher = local.dispatcher
override def registerTempActor(actorRef: InternalActorRef, path: ActorPath): Unit = local.registerTempActor(actorRef, path)
override def unregisterTempActor(path: ActorPath): Unit = local.unregisterTempActor(path)