diff options
| author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-10-30 08:51:33 +0100 |
|---|---|---|
| committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-10-30 09:59:45 +0100 |
| commit | f627d8a51e6b4f9afc017ee4bf02604cd094c9ae (patch) | |
| tree | b56a7e22a42832445143e358c3b57f2a1c5cff72 /src/actors | |
| parent | 2c554249fd8e99286134b217027b6e3cb2c92d77 (diff) | |
| download | scala-f627d8a51e6b4f9afc017ee4bf02604cd094c9ae.tar.gz scala-f627d8a51e6b4f9afc017ee4bf02604cd094c9ae.tar.bz2 scala-f627d8a51e6b4f9afc017ee4bf02604cd094c9ae.zip | |
SI-6581 fixed by inlining `Actor.self`.
This avoids the necessary type cast that was preventing leakage of internal migration classes.
Review by @phaller
Diffstat (limited to 'src/actors')
| -rw-r--r-- | src/actors/scala/actors/remote/NetKernel.scala | 2 | ||||
| -rw-r--r-- | src/actors/scala/actors/remote/RemoteActor.scala | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/actors/scala/actors/remote/NetKernel.scala b/src/actors/scala/actors/remote/NetKernel.scala index c6b2d8b8cd..8338f9a6a6 100644 --- a/src/actors/scala/actors/remote/NetKernel.scala +++ b/src/actors/scala/actors/remote/NetKernel.scala @@ -60,7 +60,7 @@ private[remote] class NetKernel(service: Service) { send(node, name, msg, 'nosession) def send(node: Node, name: Symbol, msg: AnyRef, session: Symbol) { - val senderLoc = Locator(service.node, getOrCreateName(Actor.self)) + val senderLoc = Locator(service.node, getOrCreateName(Actor.self(Scheduler))) val receiverLoc = Locator(node, name) namedSend(senderLoc, receiverLoc, msg, session) } diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala index 23cbae8532..571cb67e95 100644 --- a/src/actors/scala/actors/remote/RemoteActor.scala +++ b/src/actors/scala/actors/remote/RemoteActor.scala @@ -40,7 +40,7 @@ package remote */ object RemoteActor { - private val kernels = new scala.collection.mutable.HashMap[Actor, NetKernel] + private val kernels = new scala.collection.mutable.HashMap[InternalActor, NetKernel] /* If set to <code>null</code> (default), the default class loader * of <code>java.io.ObjectInputStream</code> is used for deserializing @@ -62,7 +62,7 @@ object RemoteActor { private def createNetKernelOnPort(port: Int): NetKernel = { val serv = TcpService(port, cl) val kern = serv.kernel - val s = Actor.self + val s = Actor.self(Scheduler) kernels += Pair(s, kern) s.onTerminate { @@ -86,10 +86,10 @@ object RemoteActor { * node. */ def register(name: Symbol, a: Actor): Unit = synchronized { - val kernel = kernels.get(Actor.self) match { + val kernel = kernels.get(Actor.self(Scheduler)) match { case None => val serv = TcpService(TcpService.generatePort, cl) - kernels += Pair(Actor.self, serv.kernel) + kernels += Pair(Actor.self(Scheduler), serv.kernel) serv.kernel case Some(k) => k @@ -97,7 +97,7 @@ object RemoteActor { kernel.register(name, a) } - private def selfKernel = kernels.get(Actor.self) match { + private def selfKernel = kernels.get(Actor.self(Scheduler)) match { case None => // establish remotely accessible // return path (sender) |