Merge pull request #1536 from vjovanov/issues/SI-6581

SI-6581 fixed by inlining `Actor.self`.

2 files changed, 35 insertions, 0 deletions

diff --git a/test/files/jvm/actmig-remote-actor-self.check b/test/files/jvm/actmig-remote-actor-self.check
new file mode 100644
index 0000000000..79d23cb337
--- /dev/null
+++ b/test/files/jvm/actmig-remote-actor-self.check
@@ -0,0 +1 @@
+registered
diff --git a/test/files/jvm/actmig-remote-actor-self.scala b/test/files/jvm/actmig-remote-actor-self.scala
new file mode 100644
index 0000000000..2b994f6081
--- /dev/null
+++ b/test/files/jvm/actmig-remote-actor-self.scala
@@ -0,0 +1,34 @@
+/**
+ * NOTE: Code snippets from this test are included in the Actor Migration Guide. In case you change
+ * code in these tests prior to the 2.10.0 release please send the notification to @vjovanov.
+ */
+import scala.actors._
+import scala.actors.migration._
+import scala.actors.remote._
+import scala.actors.remote.RemoteActor._
+import scala.concurrent._
+import scala.concurrent.duration._
+
+object Test {
+  val finished = Promise[Boolean]
+
+  def main(args: Array[String]): Unit = {
+
+    // can fail with class cast exception in alive
+    val myAkkaActor = ActorDSL.actor(new StashingActor {
+      override def preStart() = {
+        alive(42013)
+        println("registered")
+        finished success true
+        context.stop(self)
+      }
+
+      def receive = {
+        case x: Int =>
+      }
+    })
+
+    Await.result(finished.future, Duration.Inf).toString
+  }
+
+}