From d9b3e42af6a37a12bdf4082036d1391cbc4db53d Mon Sep 17 00:00:00 2001 From: momania Date: Mon, 3 Jan 2011 11:12:40 +0100 Subject: [PATCH] stop the timers (if any) while terminating --- akka-actor/src/main/scala/akka/actor/FSM.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala index 10a0944147..81078f59be 100755 --- a/akka-actor/src/main/scala/akka/actor/FSM.scala +++ b/akka-actor/src/main/scala/akka/actor/FSM.scala @@ -378,6 +378,7 @@ trait FSM[S, D] { } private def terminate(reason: Reason) = { + timers.foreach{ case (timer, t) => log.slf4j.info("Canceling timer {}", timer); t.cancel} terminateEvent.apply(StopEvent(reason, currentState.stateName, currentState.stateData)) self.stop }