summaryrefslogtreecommitdiff
path: root/src/actors
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2010-03-17 11:07:50 +0000
committerPhilipp Haller <hallerp@gmail.com>2010-03-17 11:07:50 +0000
commit7fb02f53def7a11ea2c25c3f831b8ce2c9c9b3be (patch)
tree451dff991322ae22f3a31041ea5109f7bda81dc7 /src/actors
parentc2a9a308cce58d1a1fec703235cdce4e7438e0a0 (diff)
downloadscala-7fb02f53def7a11ea2c25c3f831b8ce2c9c9b3be.tar.gz
scala-7fb02f53def7a11ea2c25c3f831b8ce2c9c9b3be.tar.bz2
scala-7fb02f53def7a11ea2c25c3f831b8ce2c9c9b3be.zip
Closes #3185. Review by plocinic.
Diffstat (limited to 'src/actors')
-rw-r--r--src/actors/scala/actors/Reactor.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/actors/scala/actors/Reactor.scala b/src/actors/scala/actors/Reactor.scala
index c20f6dd41a..ecd7148da0 100644
--- a/src/actors/scala/actors/Reactor.scala
+++ b/src/actors/scala/actors/Reactor.scala
@@ -271,6 +271,8 @@ trait Reactor[Msg >: Null] extends OutputChannel[Msg] with Combinators {
private[actors] def terminated() {
synchronized {
_state = Actor.State.Terminated
+ // reset waitingFor, otherwise getState returns Suspended
+ waitingFor = Reactor.waitingForNone
}
scheduler.terminated(this)
}