From ecc26c7380f87caa90729d55e2d301ca068ef713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= <jonasremove@jonasboner.com>
Date: Tue, 8 Jun 2010 20:46:12 +0200
Subject: [PATCH] Fixed bug in setting sender ref + changed version to 0.10

---
 akka-core/src/main/scala/actor/ActorRef.scala | 26 +++++++------------
 akka-core/src/main/scala/config/Config.scala  |  2 +-
 config/akka-reference.conf                    |  2 +-
 project/build.properties                      |  2 +-
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index 59ab5c06c2..32442d2b09 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -891,7 +891,6 @@ sealed class LocalActorRef private[akka](
   }
 
   protected[akka] def postMessageToMailbox(message: Any, senderOption: Option[ActorRef]): Unit = {
-    sender = senderOption
     joinTransaction(message)
 
     if (remoteAddress.isDefined) {
@@ -924,7 +923,6 @@ sealed class LocalActorRef private[akka](
       timeout: Long,
       senderOption: Option[ActorRef],
       senderFuture: Option[CompletableFuture[T]]): CompletableFuture[T] = {
-    sender = senderOption
     joinTransaction(message)
 
     if (remoteAddress.isDefined) {
@@ -974,9 +972,9 @@ sealed class LocalActorRef private[akka](
       Actor.log.warning("Actor [%s] is shut down, ignoring message [%s]", toString, messageHandle)
       return
     }
+    sender = messageHandle.sender
+    senderFuture = messageHandle.senderFuture
     try {
-      sender = messageHandle.sender
-      senderFuture = messageHandle.senderFuture
       if (TransactionManagement.isTransactionalityEnabled) transactionalDispatch(messageHandle)
       else dispatch(messageHandle)
     } catch {
@@ -990,9 +988,7 @@ sealed class LocalActorRef private[akka](
     val message = messageHandle.message //serializeMessage(messageHandle.message)
     setTransactionSet(messageHandle.transactionSet)
     try {
-      if (actor.base.isDefinedAt(message)) actor.base(message) // invoke user actor's receive partial function
-      else throw new IllegalArgumentException(
-        "No handler matching message [" + message + "] in " + toString)
+      actor.base(message)
     } catch {
       case e =>
         _isBeingRestarted = true
@@ -1021,20 +1017,16 @@ sealed class LocalActorRef private[akka](
       }
     setTransactionSet(txSet)
 
-    def proceed = {
-      if (actor.base.isDefinedAt(message)) actor.base(message) // invoke user actor's receive partial function
-      else throw new IllegalArgumentException(
-        toString + " could not process message [" + message + "]" +
-        "\n\tsince no matching 'case' clause in its 'receive' method could be found")
-      setTransactionSet(txSet) // restore transaction set to allow atomic block to do commit
-    }
-
     try {
       if (isTransactor) {
         atomic {
-          proceed
+          actor.base(message)
+          setTransactionSet(txSet) // restore transaction set to allow atomic block to do commit
         }
-      } else proceed
+      } else {
+        actor.base(message)
+        setTransactionSet(txSet) // restore transaction set to allow atomic block to do commit
+      }
     } catch {
       case e: IllegalStateException => {}
       case e =>
diff --git a/akka-core/src/main/scala/config/Config.scala b/akka-core/src/main/scala/config/Config.scala
index ba1e8cb056..68842ad1e3 100644
--- a/akka-core/src/main/scala/config/Config.scala
+++ b/akka-core/src/main/scala/config/Config.scala
@@ -16,7 +16,7 @@ class ConfigurationException(message: String) extends RuntimeException(message)
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
 object Config extends Logging {
-  val VERSION = "0.10-SNAPSHOT"
+  val VERSION = "0.10"
 
   // Set Multiverse options for max speed
   System.setProperty("org.multiverse.MuliverseConstants.sanityChecks", "false")
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 04ba26798d..2ac6bf42f1 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -15,7 +15,7 @@
 </log>
 
 <akka>
-  version = "0.10-SNAPSHOT"
+  version = "0.10"
 
   # FQN (Fully Qualified Name) to the class doing initial active object/actor
   # supervisor bootstrap, should be defined in default constructor
diff --git a/project/build.properties b/project/build.properties
index 060f9af2b5..cc8e376f1b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,6 +1,6 @@
 project.organization=se.scalablesolutions.akka
 project.name=akka
-project.version=0.10-SNAPSHOT
+project.version=0.10
 scala.version=2.8.0.RC3
 sbt.version=0.7.4
 def.scala.version=2.7.7