summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2010-02-24 12:18:45 +0000
committerPhilipp Haller <hallerp@gmail.com>2010-02-24 12:18:45 +0000
commitf270f7ecfb30c331aa650d7b75fdbabc78be006b (patch)
treecf8182e25bb2cca5904b69fc0a5f0c8c7fae8caa /src/actors
parent415fced48d7ecb097eef257c1a737868acb82575 (diff)
downloadscala-f270f7ecfb30c331aa650d7b75fdbabc78be006b.tar.gz
scala-f270f7ecfb30c331aa650d7b75fdbabc78be006b.tar.bz2
scala-f270f7ecfb30c331aa650d7b75fdbabc78be006b.zip
Fixed problem with daemon actor termination.
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/Actor.scala6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 2d672adb97..aeda4a4670 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -674,11 +674,7 @@ trait Actor extends AbstractActor with ReplyReactor with ReplyableActor {
shouldExit = false
scheduler newActor this
- val task = new Reaction(this)
- if (Actor.rawSelf(scheduler).isInstanceOf[ActorProxy])
- scheduler execute task
- else
- scheduler executeFromActor task
+ scheduler execute (new Reaction(this))
this
}