Made serialization of functions used in the rem...

Made serialization of functions used in the remote actors runtime more
robust by creating explicit classes.

1 files changed, 30 insertions, 6 deletions

diff --git a/src/actors/scala/actors/remote/Proxy.scala b/src/actors/scala/actors/remote/Proxy.scala
index 5f3bbda723..f45d1d390b 100644
--- a/src/actors/scala/actors/remote/Proxy.scala
+++ b/src/actors/scala/actors/remote/Proxy.scala
@@ -71,21 +71,45 @@ class Proxy(node: Node, name: Symbol, @transient var kernel: NetKernel) extends
     del !! (msg, f)
 
   def linkTo(to: AbstractActor): Unit =
-    del ! Apply0((target: AbstractActor, creator: Proxy) =>
-      target.linkTo(creator))
+    del ! Apply0(new LinkToFun)
 
   def unlinkFrom(from: AbstractActor): Unit =
-    del ! Apply0((target: AbstractActor, creator: Proxy) =>
-      target.unlinkFrom(creator))
+    del ! Apply0(new UnlinkFromFun)
 
   def exit(from: AbstractActor, reason: AnyRef): Unit =
-    del ! Apply0((target: AbstractActor, creator: Proxy) =>
-      target.exit(creator, reason))
+    del ! Apply0(new ExitFun(reason))
 
   override def toString() =
     name+"@"+node
 }
 
+@serializable
+class LinkToFun extends Function2[AbstractActor, Proxy, Unit] {
+  def apply(target: AbstractActor, creator: Proxy) {
+    target.linkTo(creator)
+  }
+  override def toString =
+    "<LinkToFun>"
+}
+
+@serializable
+class UnlinkFromFun extends Function2[AbstractActor, Proxy, Unit] {
+  def apply(target: AbstractActor, creator: Proxy) {
+    target.unlinkFrom(creator)
+  }
+  override def toString =
+    "<UnlinkFromFun>"
+}
+
+@serializable
+class ExitFun(reason: AnyRef) extends Function2[AbstractActor, Proxy, Unit] {
+  def apply(target: AbstractActor, creator: Proxy) {
+    target.exit(creator, reason)
+  }
+  override def toString =
+    "<ExitFun>("+reason.toString+")"
+}
+
 case class Apply0(rfun: Function2[AbstractActor, Proxy, Unit])
 
 /**