From 8fe909a4e0108d8b39324ec31d7c35a3c8d9c33e Mon Sep 17 00:00:00 2001
From: Martin Krasser <krasserm@googlemail.com>
Date: Tue, 1 Mar 2011 12:07:52 +0100
Subject: [PATCH] Reset currentMessage if InterruptedException is thrown

---
 akka-actor/src/main/scala/akka/actor/ActorRef.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
index 6716a7c322..307dfa62dc 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
@@ -825,7 +825,7 @@ class LocalActorRef private[akka] (
           actor(messageHandle.message)
           currentMessage = null // reset current message after successful invocation
         } catch {
-          case e: InterruptedException => {} // received message while actor is shutting down, ignore
+          case e: InterruptedException => { currentMessage = null } // received message while actor is shutting down, ignore
           case e => handleExceptionInDispatch(e, messageHandle.message)
         } finally {
           checkReceiveTimeout // Reschedule receive timeout