From 7083737f953f482b6d9ea00d31aab05aa194b56a Mon Sep 17 00:00:00 2001
From: Jonas Boner <jonas@jonasboner.com>
Date: Mon, 29 Jun 2009 17:33:38 +0200
Subject: [PATCH] iteration 1 of nested transactional components

---
 akka.iws                                      | 523 +++++++++++++-----
 .../akka/api/InMemNestedStateTest.java        | 109 ++++
 .../akka/api/InMemStateful.java               |  18 +-
 .../akka/api/InMemStatefulNested.java         |  75 +++
 .../akka/api/PersistentNestedStateTest.java   | 115 ++++
 .../akka/api/PersistentStateful.java          |  17 +
 .../akka/api/PersistentStatefulNested.java    |  66 +++
 .../src/main/scala/actor/ActiveObject.scala   |   1 +
 kernel/src/main/scala/actor/Actor.scala       |   3 -
 .../scala/reactor/ThreadBasedDispatcher.scala |  49 --
 kernel/src/main/scala/state/State.scala       |  10 +-
 .../scala/stm/TransactionManagement.scala     |  23 +-
 12 files changed, 812 insertions(+), 197 deletions(-)
 create mode 100644 fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java
 create mode 100644 fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java
 create mode 100644 fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java
 create mode 100644 fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java
 delete mode 100644 kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala

diff --git a/akka.iws b/akka.iws
index b7833c846a..7bfb13ae87 100644
--- a/akka.iws
+++ b/akka.iws
@@ -8,30 +8,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Test" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/actor/Supervisor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/actor/Supervisor.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/nio/NettyServer.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/nio/NettyServer.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/RemoteActorSpec.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/RemoteActorSpec.scala" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.ipr" afterPath="$PROJECT_DIR$/akka.ipr" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/akka.iws" afterPath="$PROJECT_DIR$/akka.iws" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/ThreadBasedDispatcherTest.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala" afterPath="$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemoteInMemoryStateTest.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/state/State.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/state/State.scala" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/test/scala/PersistentActorSpec.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/nio/NettyClient.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/nio/NettyClient.scala" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Future.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Future.scala" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala" afterPath="$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java" />
     </list>
     <list name="Default" comment="&#10;# Brief commit desciption here&#10;&#10;# Full commit description here (comment lines starting with '#' will not be included)&#10;&#10;" />
-    <ignored path="akka.iws" />
     <ignored path=".idea/workspace.xml" />
+    <ignored path="akka.iws" />
   </component>
   <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
   <component name="Commander">
@@ -100,7 +92,46 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
-      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala" line="316" class="Class at Actor.scala:316" package="">
+      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java" line="46" class="se.scalablesolutions.akka.api.PersistentStatefulNested" package="se.scalablesolutions.akka.api">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala" line="61" class="Class at TransactionManagement.scala:61" package="">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java" line="45" class="se.scalablesolutions.akka.api.PersistentNestedStateTest" package="se.scalablesolutions.akka.api">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala" line="68" class="Class at Transaction.scala:68" package="">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -176,46 +207,19 @@
   <component name="FileColors" enabled="false" enabledForTabs="false" />
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PersistentActorSpec.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/PersistentActorSpec.scala">
+      <file leaf-file-name="PersistentNestedStateTest.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="134" column="0" selection-start="4944" selection-end="4944" vertical-scroll-proportion="0.0">
+            <state line="45" column="0" selection-start="1936" selection-end="1936" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InMemoryActorSpec.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala">
+      <file leaf-file-name="State.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="64" column="6" selection-start="1788" selection-end="1788" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="EventBasedDispatcherTest.scala" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="32" column="102" selection-start="1012" selection-end="1012" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Reactor.scala" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="36" column="57" selection-start="1014" selection-end="1014" vertical-scroll-proportion="0.33269045">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="InMemoryStateTest.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="72" column="14" selection-start="3548" selection-end="3548" vertical-scroll-proportion="0.0">
+            <state line="157" column="86" selection-start="5629" selection-end="5629" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -224,7 +228,34 @@
       <file leaf-file-name="TransactionManagement.scala" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="89" column="16" selection-start="2858" selection-end="2858" vertical-scroll-proportion="0.0">
+            <state line="61" column="0" selection-start="1967" selection-end="1967" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Transaction.scala" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="63" column="33" selection-start="2173" selection-end="2173" vertical-scroll-proportion="0.09836066">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ChangeSet.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/ChangeSet.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="10" column="6" selection-start="252" selection-end="252" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CassandraNode.scala" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraNode.scala">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="134" column="0" selection-start="4277" selection-end="4277" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -233,7 +264,25 @@
       <file leaf-file-name="Actor.scala" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="337" column="0" selection-start="11395" selection-end="11446" vertical-scroll-proportion="0.0">
+            <state line="319" column="0" selection-start="10764" selection-end="10764" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PersistentStateful.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="61" column="0" selection-start="1734" selection-end="1734" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PersistentStatefulNested.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="46" column="0" selection-start="1366" selection-end="1366" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -242,25 +291,7 @@
       <file leaf-file-name="ActiveObject.scala" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="165" column="39" selection-start="6105" selection-end="6105" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PersistentStateTest.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="84" column="14" selection-start="4011" selection-end="4011" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="RemotePersistentStateTest.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="86" column="14" selection-start="3967" selection-end="3967" vertical-scroll-proportion="0.0">
+            <state line="149" column="12" selection-start="5652" selection-end="5652" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -1360,6 +1391,36 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="kernel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="scala" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="camel" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -1636,6 +1697,40 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-funtest-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="fun-test-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="api" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PersistentNestedStateTest" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -1704,6 +1799,74 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-funtest-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="fun-test-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="api" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="InMemNestedStateTest" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-funtest-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="fun-test-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="api" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PersistentStatefulNested" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -1772,6 +1935,40 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="akka-funtest-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="fun-test-java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="api" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="InMemStatefulNested" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ClassTreeNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="akka" />
@@ -1978,19 +2175,19 @@
     </navigator>
   </component>
   <component name="PropertiesComponent">
-    <property name="GoToClass.includeJavaFiles" value="false" />
     <property name="project.structure.proportion" value="0.15" />
+    <property name="GoToClass.includeJavaFiles" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder2" value="2" />
-    <property name="options.splitter.main.proportions" value="0.3" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
+    <property name="options.splitter.main.proportions" value="0.3" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="697" />
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="200" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth2" value="210" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="GoToClass.includeLibraries" value="false" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth2" value="217" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder3" value="3" />
     <property name="MemberChooser.showClasses" value="true" />
@@ -2002,13 +2199,13 @@
     <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder0" value="0" />
     <property name="project.structure.last.edited" value="Modules" />
-    <property name="MemberChooser.sorted" value="false" />
     <property name="options.searchVisible" value="true" />
+    <property name="MemberChooser.sorted" value="false" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder1" value="1" />
     <property name="recentsLimit" value="5" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth1" value="221" />
-    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="711" />
     <property name="dynamic.classpath" value="false" />
+    <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth3" value="711" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="228" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder1" value="1" />
   </component>
@@ -2021,7 +2218,7 @@
       <recent name="actor" />
     </key>
   </component>
-  <component name="RunManager" selected="Application.NettyServer">
+  <component name="RunManager" selected="JUnit.PersistentStateTest">
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -2682,6 +2879,64 @@
         <option name="Make" value="false" />
       </method>
     </configuration>
+    <configuration default="false" name="InMemNestedStateTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
+      <module name="akka-funtest-java" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="se.scalablesolutions.akka.api" />
+      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.api.InMemNestedStateTest" />
+      <option name="METHOD_NAME" value="" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method>
+        <option name="AntTarget" value="false" />
+        <option name="Maven.BeforeRunTask" value="false" />
+        <option name="Make" value="false" />
+      </method>
+    </configuration>
+    <configuration default="false" name="PersistentNestedStateTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma">
+      <module name="akka-funtest-java" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="se.scalablesolutions.akka.api" />
+      <option name="MAIN_CLASS_NAME" value="se.scalablesolutions.akka.api.PersistentNestedStateTest" />
+      <option name="METHOD_NAME" value="" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-Dcassandra -Dstorage-config=config/ -Dpidfile=akka.pid" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="51635" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method>
+        <option name="AntTarget" value="false" />
+        <option name="Maven.BeforeRunTask" value="false" />
+        <option name="Make" value="false" />
+      </method>
+    </configuration>
     <configuration default="false" name="Scala Console" type="ScalaScriptConsoleRunConfiguration" factoryName="Scala Console">
       <module name="" />
       <setting name="vmparams" value="" />
@@ -2694,7 +2949,7 @@
         <option name="Make" value="false" />
       </method>
     </configuration>
-    <list size="20">
+    <list size="22">
       <item index="0" class="java.lang.String" itemvalue="Application.Kernel" />
       <item index="1" class="java.lang.String" itemvalue="Application.NettyClient" />
       <item index="2" class="java.lang.String" itemvalue="Application.NettyServer" />
@@ -2714,7 +2969,9 @@
       <item index="16" class="java.lang.String" itemvalue="JUnit.RemoteActorSpec" />
       <item index="17" class="java.lang.String" itemvalue="JUnit.InMemStatefulActor" />
       <item index="18" class="java.lang.String" itemvalue="JUnit.PersistentActor" />
-      <item index="19" class="java.lang.String" itemvalue="Scala Console.Scala Console" />
+      <item index="19" class="java.lang.String" itemvalue="JUnit.InMemNestedStateTest" />
+      <item index="20" class="java.lang.String" itemvalue="JUnit.PersistentNestedStateTest" />
+      <item index="21" class="java.lang.String" itemvalue="Scala Console.Scala Console" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -2796,7 +3053,7 @@
       <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.6875" order="3" side_tool="false" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294881" sideWeight="0.59183675" order="4" side_tool="false" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32749078" sideWeight="0.5" order="6" side_tool="false" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21156937" sideWeight="0.37638375" order="1" side_tool="false" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21156937" sideWeight="0.13653137" order="1" side_tool="false" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32380074" sideWeight="0.5" order="1" side_tool="false" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2769342" sideWeight="0.22094509" order="0" side_tool="true" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
@@ -2804,8 +3061,8 @@
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24945927" sideWeight="0.6875" order="1" side_tool="false" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32780612" sideWeight="0.5" order="9" side_tool="false" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.61715865" sideWeight="0.5" order="2" side_tool="false" x="4" y="22" width="1436" height="878" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32749078" sideWeight="0.5" order="9" side_tool="false" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.8570111" sideWeight="0.5" order="2" side_tool="false" x="4" y="22" width="1436" height="878" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997114" sideWeight="0.75" order="0" side_tool="false" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44464946" sideWeight="0.5" order="3" side_tool="false" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" />
@@ -2860,114 +3117,118 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../../java/cassandra/src/java/org/apache/cassandra/service/CassandraServer.java">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="299" column="0" selection-start="10331" selection-end="10331" vertical-scroll-proportion="0.0">
+        <state line="24" column="0" selection-start="870" selection-end="870" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/../../../bin/scala-2.7.3.final/src/scala-library-src.jar!/scala/List.scala">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="833" column="0" selection-start="25646" selection-end="25646" vertical-scroll-proportion="0.0">
+        <state line="26" column="53" selection-start="0" selection-end="6014" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/../../../bin/scala-2.7.3.final/src/scala-library-src.jar!/scala/StringBuilder.scala">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="233" column="0" selection-start="8290" selection-end="8290" vertical-scroll-proportion="0.0">
+        <state line="17" column="31" selection-start="639" selection-end="639" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="74" column="0" selection-start="1254" selection-end="1901" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="0" selection-start="572" selection-end="668" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/WEB-INF/classes/se/scalablesolutions/akka/kernel/CassandraPersistentTransactionalMap.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/State.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="206" column="24" selection-start="7467" selection-end="7467" vertical-scroll-proportion="0.0">
+        <state line="157" column="86" selection-start="5629" selection-end="5629" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraNode.scala">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/ChangeSet.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="108" column="0" selection-start="3451" selection-end="3451" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="95" column="8" selection-start="3247" selection-end="3247" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="89" column="16" selection-start="2858" selection-end="2858" vertical-scroll-proportion="0.0">
+        <state line="10" column="6" selection-start="252" selection-end="252" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/Actor.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="337" column="0" selection-start="11395" selection-end="11446" vertical-scroll-proportion="0.0">
+        <state line="319" column="0" selection-start="10764" selection-end="10764" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="61" column="0" selection-start="1734" selection-end="1734" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/actor/ActiveObject.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="165" column="39" selection-start="6105" selection-end="6105" vertical-scroll-proportion="0.0">
+        <state line="149" column="12" selection-start="5652" selection-end="5652" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="72" column="14" selection-start="3548" selection-end="3548" vertical-scroll-proportion="0.0">
+        <state line="46" column="0" selection-start="1366" selection-end="1366" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/state/CassandraNode.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="84" column="14" selection-start="4011" selection-end="4011" vertical-scroll-proportion="0.0">
+        <state line="134" column="0" selection-start="4277" selection-end="4277" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java">
+    <entry file="file://$PROJECT_DIR$/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="86" column="14" selection-start="3967" selection-end="3967" vertical-scroll-proportion="0.0">
+        <state line="45" column="0" selection-start="1936" selection-end="1936" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/PersistentActorSpec.scala">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/TransactionManagement.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="134" column="0" selection-start="4944" selection-end="4944" vertical-scroll-proportion="0.0">
+        <state line="61" column="0" selection-start="1967" selection-end="1967" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/InMemoryActorSpec.scala">
+    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/stm/Transaction.scala">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="64" column="6" selection-start="1788" selection-end="1788" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/test/scala/EventBasedDispatcherTest.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="102" selection-start="1012" selection-end="1012" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/kernel/src/main/scala/reactor/Reactor.scala">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="36" column="57" selection-start="1014" selection-end="1014" vertical-scroll-proportion="0.33269045">
+        <state line="63" column="33" selection-start="2173" selection-end="2173" vertical-scroll-proportion="0.09836066">
           <folding />
         </state>
       </provider>
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java
new file mode 100644
index 0000000000..d78f2b741c
--- /dev/null
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java
@@ -0,0 +1,109 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.api;
+
+import se.scalablesolutions.akka.kernel.config.*;
+import static se.scalablesolutions.akka.kernel.config.JavaConfig.*;
+import se.scalablesolutions.akka.kernel.actor.*;
+
+import junit.framework.TestCase;
+
+public class InMemNestedStateTest extends TestCase {
+  static String messageLog = "";
+
+  final private ActiveObjectGuiceConfiguratorForJava conf = new ActiveObjectGuiceConfiguratorForJava();
+  final private ActiveObjectFactory factory = new ActiveObjectFactory();
+
+  protected void setUp() {
+    conf.configureActiveObjects(
+        new RestartStrategy(new AllForOne(), 3, 5000),
+        new Component[]{
+            // FIXME: remove string-name, add ctor to only accept target class
+            new Component(InMemStateful.class, new LifeCycle(new Permanent(), 1000), 10000000),
+            new Component(InMemStatefulNested.class, new LifeCycle(new Permanent(), 1000), 10000000),
+            new Component(InMemFailer.class, new LifeCycle(new Permanent(), 1000), 1000)
+            //new Component("inmem-clasher", InMemClasher.class, InMemClasherImpl.class, new LifeCycle(new Permanent(), 1000), 100000)
+        }).inject().supervise();
+  }
+
+  protected void tearDown() {
+    conf.stop();
+  }
+
+  public void testMapShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
+    InMemStateful stateful = conf.getActiveObject(InMemStateful.class);
+    stateful.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init"); // set init state
+    InMemStatefulNested nested = conf.getActiveObject(InMemStatefulNested.class);
+    nested.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init"); // set init state
+    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested); // transactional
+    assertEquals("new state", stateful.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess"));
+    assertEquals("new state", nested.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess"));
+  }
+
+  public void testMapShouldRollbackStateForStatefulServerInCaseOfFailure() {
+    InMemStateful stateful = conf.getActiveObject(InMemStateful.class);
+    stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init"); // set init state
+    InMemStatefulNested nested = conf.getActiveObject(InMemStatefulNested.class);
+    nested.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init"); // set init state
+    InMemFailer failer = conf.getActiveObject(InMemFailer.class);
+    try {
+      stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer); // call failing transactional method
+      fail("should have thrown an exception");
+    } catch (RuntimeException e) {
+    } // expected
+    assertEquals("init", stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure")); // check that state is == init state
+    assertEquals("init", nested.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure")); // check that state is == init state
+  }
+
+  public void testVectorShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
+    InMemStateful stateful = conf.getActiveObject(InMemStateful.class);
+    stateful.setVectorState("init"); // set init state
+    InMemStatefulNested nested = conf.getActiveObject(InMemStatefulNested.class);
+    nested.setVectorState("init"); // set init state
+    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested); // transactional
+    assertEquals("new state", stateful.getVectorState());
+    assertEquals("new state", nested.getVectorState());
+  }
+
+  public void testVectorShouldRollbackStateForStatefulServerInCaseOfFailure() {
+    InMemStateful stateful = conf.getActiveObject(InMemStateful.class);
+    stateful.setVectorState("init"); // set init state
+    InMemStatefulNested nested = conf.getActiveObject(InMemStatefulNested.class);
+    nested.setVectorState("init"); // set init state
+    InMemFailer failer = conf.getActiveObject(InMemFailer.class);
+    try {
+      stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer); // call failing transactional method
+      fail("should have thrown an exception");
+    } catch (RuntimeException e) {
+    } // expected
+    assertEquals("init", stateful.getVectorState()); // check that state is == init state
+    assertEquals("init", nested.getVectorState()); // check that state is == init state
+  }
+
+  public void testRefShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
+    InMemStateful stateful = conf.getActiveObject(InMemStateful.class);
+    InMemStatefulNested nested = conf.getActiveObject(InMemStatefulNested.class);
+    stateful.setRefState("init"); // set init state
+    nested.setRefState("init"); // set init state
+    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested); // transactional
+    assertEquals("new state", stateful.getRefState());
+    assertEquals("new state", nested.getRefState());
+  }
+
+  public void testRefShouldRollbackStateForStatefulServerInCaseOfFailure() {
+    InMemStateful stateful = conf.getActiveObject(InMemStateful.class);
+    InMemStatefulNested nested = conf.getActiveObject(InMemStatefulNested.class);
+    stateful.setRefState("init"); // set init state
+    nested.setRefState("init"); // set init state
+    InMemFailer failer = conf.getActiveObject(InMemFailer.class);
+    try {
+      stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer); // call failing transactional method
+      fail("should have thrown an exception");
+    } catch (RuntimeException e) {
+    } // expected
+    assertEquals("init", stateful.getRefState()); // check that state is == init state
+    assertEquals("init", nested.getRefState()); // check that state is == init state
+  }
+}
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java
index 313e5a187e..f46a7e621b 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStateful.java
@@ -47,6 +47,13 @@ public class InMemStateful {
     refState.swap(msg);
   }
 
+  public void success(String key, String msg, InMemStatefulNested nested) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+    nested.success(key, msg); 
+  }
+
   @transactional
   public String failure(String key, String msg, InMemFailer failer) {
     mapState.put(key, msg);
@@ -56,6 +63,15 @@ public class InMemStateful {
     return msg;
   }
 
+  @transactional
+  public String failure(String key, String msg, InMemStatefulNested nested, InMemFailer failer) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+    nested.failure(key, msg, failer);
+    return msg;
+  }
+
   @transactional
   public void thisMethodHangs(String key, String msg, InMemFailer failer) {
     setMapState(key, msg);
@@ -73,4 +89,4 @@ public class InMemStateful {
     this.success("clash", "clash");
   }
   */
-}
\ No newline at end of file
+}
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java
new file mode 100644
index 0000000000..867a20ffb2
--- /dev/null
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemStatefulNested.java
@@ -0,0 +1,75 @@
+package se.scalablesolutions.akka.api;
+
+import se.scalablesolutions.akka.annotation.transactional;
+import se.scalablesolutions.akka.kernel.state.*;
+
+public class InMemStatefulNested {
+  private TransactionalState factory = new TransactionalState();
+  private TransactionalMap<String, String> mapState = factory.newInMemoryMap();
+  private TransactionalVector<String> vectorState = factory.newInMemoryVector();
+  private TransactionalRef<String> refState = factory.newInMemoryRef();
+
+  @transactional
+  public String getMapState(String key) {
+    return (String)mapState.get(key).get();
+  }
+
+  @transactional
+  public String getVectorState() {
+    return (String)vectorState.last();
+  }
+
+  @transactional
+  public String getRefState() {
+    return (String)refState.get().get();
+  }
+
+  @transactional
+  public void setMapState(String key, String msg) {
+    mapState.put(key, msg);
+  }
+
+  @transactional
+  public void setVectorState(String msg) {
+    vectorState.add(msg);
+  }
+
+  @transactional
+  public void setRefState(String msg) {
+    refState.swap(msg);
+  }
+
+  @transactional
+  public void success(String key, String msg) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+  }
+
+  @transactional
+  public String failure(String key, String msg, InMemFailer failer) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+    failer.fail();
+    return msg;
+  }
+
+  @transactional
+  public void thisMethodHangs(String key, String msg, InMemFailer failer) {
+    setMapState(key, msg);
+  }
+
+  /*
+  public void clashOk(String key, String msg, InMemClasher clasher) {
+    mapState.put(key, msg);
+    clasher.clash();
+  }
+
+  public void clashNotOk(String key, String msg, InMemClasher clasher) {
+    mapState.put(key, msg);
+    clasher.clash();
+    this.success("clash", "clash");
+  }
+  */
+}
\ No newline at end of file
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java
new file mode 100644
index 0000000000..dbdce4cb83
--- /dev/null
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright (C) 2009 Scalable Solutions.
+ */
+
+package se.scalablesolutions.akka.api;
+
+import se.scalablesolutions.akka.kernel.config.*;
+import static se.scalablesolutions.akka.kernel.config.JavaConfig.*;
+import se.scalablesolutions.akka.kernel.actor.*;
+import se.scalablesolutions.akka.kernel.Kernel;
+
+import junit.framework.TestCase;
+
+public class PersistentNestedStateTest extends TestCase {
+  static String messageLog = "";
+
+  final private ActiveObjectGuiceConfiguratorForJava conf = new ActiveObjectGuiceConfiguratorForJava();
+  final private ActiveObjectFactory factory = new ActiveObjectFactory();
+
+  static {
+    System.setProperty("storage-config", "config");
+    Kernel.startCassandra();
+  }
+  
+  protected void setUp() {
+    conf.configureActiveObjects(
+        new RestartStrategy(new AllForOne(), 3, 5000),
+        new Component[]{
+            // FIXME: remove string-name, add ctor to only accept target class
+            new Component(PersistentStateful.class, new LifeCycle(new Permanent(), 1000), 10000000),
+            new Component(PersistentStatefulNested.class, new LifeCycle(new Permanent(), 1000), 10000000),
+            new Component(PersistentFailer.class, new LifeCycle(new Permanent(), 1000), 1000)
+            //new Component("inmem-clasher", InMemClasher.class, InMemClasherImpl.class, new LifeCycle(new Permanent(), 1000), 100000)
+        }).inject().supervise();
+  }
+
+  protected void tearDown() {
+    conf.stop();
+  }
+
+  public void testMapShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
+    PersistentStateful stateful = conf.getActiveObject(PersistentStateful.class);
+    PersistentStatefulNested nested = conf.getActiveObject(PersistentStatefulNested.class);
+    stateful.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init"); // set init state
+    nested.setMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "init"); // set init state
+    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested); // transactional
+    assertEquals("new state", nested.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess"));
+    assertEquals("new state", stateful.getMapState("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess"));
+  }
+
+  public void testMapShouldRollbackStateForStatefulServerInCaseOfFailure() {
+    PersistentStateful stateful = conf.getActiveObject(PersistentStateful.class);
+    stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init"); // set init state
+    PersistentStatefulNested nested = conf.getActiveObject(PersistentStatefulNested.class);
+    nested.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init"); // set init state
+    PersistentFailer failer = conf.getActiveObject(PersistentFailer.class);
+    try {
+      stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer); // call failing transactional method
+      fail("should have thrown an exception");
+    } catch (RuntimeException e) {
+    } // expected
+    assertEquals("init", stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure")); // check that state is == init state
+    assertEquals("init", nested.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure")); // check that state is == init state
+  }
+
+  public void testVectorShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
+    PersistentStateful stateful = conf.getActiveObject(PersistentStateful.class);
+    stateful.setVectorState("init"); // set init state
+    PersistentStatefulNested nested = conf.getActiveObject(PersistentStatefulNested.class);
+    nested.setVectorState("init"); // set init state
+    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested); // transactional
+    assertEquals("new state", stateful.getVectorState(0));
+    assertEquals("new state", nested.getVectorState(0));
+  }
+
+  public void testVectorShouldRollbackStateForStatefulServerInCaseOfFailure() {
+    PersistentStateful stateful = conf.getActiveObject(PersistentStateful.class);
+    stateful.setVectorState("init"); // set init state
+    PersistentStatefulNested nested = conf.getActiveObject(PersistentStatefulNested.class);
+    nested.setVectorState("init"); // set init state
+    PersistentFailer failer = conf.getActiveObject(PersistentFailer.class);
+    try {
+      stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer); // call failing transactional method
+      fail("should have thrown an exception");
+    } catch (RuntimeException e) {
+    } // expected
+    assertEquals("init", stateful.getVectorState(0)); // check that state is == init state
+    assertEquals("init", nested.getVectorState(0)); // check that state is == init state
+  }
+
+  public void testRefShouldNotRollbackStateForStatefulServerInCaseOfSuccess() {
+    PersistentStateful stateful = conf.getActiveObject(PersistentStateful.class);
+    PersistentStatefulNested nested = conf.getActiveObject(PersistentStatefulNested.class);
+    stateful.setRefState("init"); // set init state
+    nested.setRefState("init"); // set init state
+    stateful.success("testShouldNotRollbackStateForStatefulServerInCaseOfSuccess", "new state", nested); // transactional
+    assertEquals("new state", stateful.getRefState());
+    assertEquals("new state", nested.getRefState());
+  }
+
+  public void testRefShouldRollbackStateForStatefulServerInCaseOfFailure() {
+    PersistentStateful stateful = conf.getActiveObject(PersistentStateful.class);
+    PersistentStatefulNested nested = conf.getActiveObject(PersistentStatefulNested.class);
+    stateful.setRefState("init"); // set init state
+    nested.setRefState("init"); // set init state
+    PersistentFailer failer = conf.getActiveObject(PersistentFailer.class);
+    try {
+      stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer); // call failing transactional method
+      fail("should have thrown an exception");
+    } catch (RuntimeException e) {
+    } // expected
+    assertEquals("init", stateful.getRefState()); // check that state is == init state
+    assertEquals("init", nested.getRefState()); // check that state is == init state
+  }
+}
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java
index e9492ee9e7..b3729728ef 100644
--- a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateful.java
@@ -58,6 +58,23 @@ public class PersistentStateful {
     return msg;
   }
 
+  public void success(String key, String msg, PersistentStatefulNested nested) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+    nested.success(key, msg);
+  }
+
+  @transactional
+  public String failure(String key, String msg, PersistentStatefulNested nested, PersistentFailer failer) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+    nested.failure(key, msg, failer);
+    return msg;
+  }
+
+
   @transactional
   public void thisMethodHangs(String key, String msg, PersistentFailer failer) {
     setMapState(key, msg);
diff --git a/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java
new file mode 100644
index 0000000000..6b8ba10863
--- /dev/null
+++ b/fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStatefulNested.java
@@ -0,0 +1,66 @@
+package se.scalablesolutions.akka.api;
+
+import se.scalablesolutions.akka.kernel.state.*;
+import se.scalablesolutions.akka.annotation.transactional;
+import se.scalablesolutions.akka.annotation.state;
+
+public class PersistentStatefulNested {
+  private TransactionalState factory = new TransactionalState();
+  private TransactionalMap mapState =       factory.newPersistentMap(new CassandraStorageConfig());
+  private TransactionalVector vectorState = factory.newPersistentVector(new CassandraStorageConfig());;
+  private TransactionalRef refState =       factory.newPersistentRef(new CassandraStorageConfig());
+
+  @transactional
+  public String getMapState(String key) {
+    return (String) mapState.get(key).get();
+  }
+
+  @transactional
+  public String getVectorState(int index) {
+    return (String) vectorState.get(index);
+  }
+
+  @transactional
+  public String getRefState() {
+    if (refState.isDefined()) {
+      return (String) refState.get().get();
+    } else throw new IllegalStateException("No such element");
+  }
+
+  @transactional
+  public void setMapState(String key, String msg) {
+    mapState.put(key, msg);
+  }
+
+  @transactional
+  public void setVectorState(String msg) {
+    vectorState.add(msg);
+  }
+
+  @transactional
+  public void setRefState(String msg) {
+    refState.swap(msg);
+  }
+
+  @transactional
+  public void success(String key, String msg) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+  }
+
+  @transactional
+  public String failure(String key, String msg, PersistentFailer failer) {
+    mapState.put(key, msg);
+    vectorState.add(msg);
+    refState.swap(msg);
+    failer.fail();
+    return msg;
+  }
+
+  @transactional
+  public void thisMethodHangs(String key, String msg, PersistentFailer failer) {
+    setMapState(key, msg);
+  }
+}
+
diff --git a/kernel/src/main/scala/actor/ActiveObject.scala b/kernel/src/main/scala/actor/ActiveObject.scala
index 2e74768912..87bc55727c 100644
--- a/kernel/src/main/scala/actor/ActiveObject.scala
+++ b/kernel/src/main/scala/actor/ActiveObject.scala
@@ -161,6 +161,7 @@ object ActiveObject {
       decrementTransaction
       if (isTransactionAborted) removeTransactionIfTopLevel
       else tryToPrecommitTransaction
+      TransactionManagement.threadBoundTx.set(None)
     }
   }
 
diff --git a/kernel/src/main/scala/actor/Actor.scala b/kernel/src/main/scala/actor/Actor.scala
index e9d96e57c2..12923cd849 100644
--- a/kernel/src/main/scala/actor/Actor.scala
+++ b/kernel/src/main/scala/actor/Actor.scala
@@ -314,12 +314,9 @@ trait Actor extends Logging with TransactionManagement {
   
   private def transactionalDispatch[T](message: AnyRef, timeout: Long, blocking: Boolean): Option[T] = {
     // FIXME join TX with same id, do not COMMIT
-    println("------ Actor1: " + this)
     tryToCommitTransaction
-    println("------ Actor2: " + this)
     if (isInExistingTransaction) joinExistingTransaction
     else if (isTransactional) startNewTransaction
-    println("------ Actor3: " + this)
     incrementTransaction
     try {
       val future = postMessageToMailboxAndCreateFutureResultWithTimeout(message, timeout)
diff --git a/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala b/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala
deleted file mode 100644
index 6584e1e867..0000000000
--- a/kernel/src/main/scala/reactor/ThreadBasedDispatcher.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (C) 2009 Scalable Solutions.
- */
-
-/**
- * Implements the Reactor pattern as defined in: [http://www.cs.wustl.edu/~schmidt/PDF/reactor-siemens.pdf].
- * See also this article: [http://today.java.net/cs/user/print/a/350].
- *
- * Based on code from the actorom actor framework by Sergio Bossa [http://code.google.com/p/actorom/].
- */
-package se.scalablesolutions.akka.kernel.reactor
-
-class ThreadBasedDispatcher extends MessageDispatcherBase {
-  def start = if (!active) {
-    active = true
-    val messageDemultiplexer = new EventBasedSingleThreadDemultiplexer(messageQueue)
-    selectorThread = new Thread {
-      override def run = {
-        while (active) {
-          guard.synchronized { /* empty */ } // prevents risk for deadlock as described in [http://developers.sun.com/learning/javaoneonline/2006/coreplatform/TS-1315.pdf]
-          try {
-            messageDemultiplexer.select
-          } catch { case e: InterruptedException => active = false }
-          val queue = messageDemultiplexer.acquireSelectedQueue
-          for (index <- 0 until queue.size) {
-            val handle = queue.remove
-            val handler = messageHandlers.get(handle.sender)
-            if (handler != null) handler.handle(handle)
-          }
-        }
-      }
-    }
-    selectorThread.start
-  }
-}
-
-class ThreadBasedDemultiplexer(private val messageQueue: MessageQueue) extends MessageDemultiplexer {
-  import java.util.{LinkedList, Queue}
-
-  private val selectedQueue: Queue[MessageHandle] = new LinkedList[MessageHandle]
-
-  def select = messageQueue.read(selectedQueue)
-
-  def acquireSelectedQueue: Queue[MessageHandle] = selectedQueue
-
-  def releaseSelectedQueue = throw new UnsupportedOperationException("ThreadBasedDemultiplexer can't release its queue")
-
-  def wakeUp = throw new UnsupportedOperationException("ThreadBasedDemultiplexer can't be woken up")
-}
diff --git a/kernel/src/main/scala/state/State.scala b/kernel/src/main/scala/state/State.scala
index 0749fbe2bd..43fa83a629 100644
--- a/kernel/src/main/scala/state/State.scala
+++ b/kernel/src/main/scala/state/State.scala
@@ -173,6 +173,8 @@ abstract class PersistentTransactionalMap[K, V] extends TransactionalMap[K, V] {
 
   // ---- For scala.collection.mutable.Map ----
   override def put(key: K, value: V): Option[V] = {
+    println("--------- MAP.PUT " + uuid + " " + key + " " + value)
+    
     changeSet += key -> value
     None // always return None to speed up writes (else need to go to DB to get
   }
@@ -195,6 +197,7 @@ class CassandraPersistentTransactionalMap extends PersistentTransactionalMap[Str
     // FIXME: should use batch function once the bug is resolved
     for (entry <- changeSet) {
       val (key, value) = entry
+      println("--------- COMMIT " + uuid + " " + key + " " + value)
       CassandraNode.insertMapStorageEntryFor(uuid, key, value)
     }
   }
@@ -205,7 +208,12 @@ class CassandraPersistentTransactionalMap extends PersistentTransactionalMap[Str
   override def size: Int = CassandraNode.getMapStorageSizeFor(uuid)
 
   // ---- For scala.collection.mutable.Map ----
-  override def get(key: String): Option[AnyRef] =  CassandraNode.getMapStorageEntryFor(uuid, key)
+  override def get(key: String): Option[AnyRef] = {
+    val result = CassandraNode.getMapStorageEntryFor(uuid, key)
+    println("--------- MAP.GET " + result + " " + uuid + " " + key)
+    result
+  }
+  
   override def elements: Iterator[Tuple2[String, AnyRef]]  = {
     new Iterator[Tuple2[String, AnyRef]] {
       private val originalList: List[Tuple2[String, AnyRef]] = CassandraNode.getMapStorageFor(uuid)
diff --git a/kernel/src/main/scala/stm/TransactionManagement.scala b/kernel/src/main/scala/stm/TransactionManagement.scala
index ad412cb9c1..5a02ffbfe6 100644
--- a/kernel/src/main/scala/stm/TransactionManagement.scala
+++ b/kernel/src/main/scala/stm/TransactionManagement.scala
@@ -14,13 +14,13 @@ class TransactionAwareWrapperException(val cause: Throwable, val tx: Option[Tran
   override def toString(): String = "TransactionAwareWrapperException[" + cause + ", " + tx + "]"
 }
 
-object TransactionManagement {   
+object TransactionManagement {
   private val txEnabled = new AtomicBoolean(true)
-  
+
   def isTransactionsEnabled = txEnabled.get
   def enableTransactions = txEnabled.set(true)
 
-  private[kernel] lazy val threadBoundTx: ThreadLocal[Option[Transaction]] = {
+  private[kernel] val threadBoundTx: ThreadLocal[Option[Transaction]] = {
     val tl = new ThreadLocal[Option[Transaction]]
     tl.set(None)
     tl
@@ -30,18 +30,14 @@ object TransactionManagement {
 // FIXME: STM that allows concurrent updates, detects collision, rolls back and restarts
 trait TransactionManagement extends Logging {
   val transactionalInstance: AnyRef
-  
+
   private lazy val changeSet = new ChangeSet(transactionalInstance.getClass.getName)
 
   import TransactionManagement.threadBoundTx
   private[kernel] var activeTx: Option[Transaction] = None
 
   protected def startNewTransaction = {
-    val (maps, vectors, refs) = getTransactionalItemsFor(transactionalInstance)
-    changeSet.maps = maps
-    changeSet.refs = refs
-    changeSet.vectors = vectors
-
+    storeTransactionalItemsFor(transactionalInstance)
     val newTx = new Transaction
     newTx.begin(changeSet)
     val tx = Some(newTx)
@@ -52,6 +48,7 @@ trait TransactionManagement extends Logging {
   protected def joinExistingTransaction = {
     val cflowTx = threadBoundTx.get
     if (activeTx.isDefined && cflowTx.isDefined && activeTx.get.id == cflowTx.get.id) {
+      storeTransactionalItemsFor(transactionalInstance)
       val currentTx = cflowTx.get
       currentTx.join(changeSet)
       activeTx = Some(currentTx)
@@ -102,8 +99,7 @@ trait TransactionManagement extends Logging {
   /**
    * Search for transactional items for a specific target instance, crawl the class hierarchy recursively up to the top.
    */
-  protected def getTransactionalItemsFor(targetInstance: AnyRef):
-    Tuple3[List[TransactionalMap[_, _]], List[TransactionalVector[_]], List[TransactionalRef[_]]] = {
+  protected def storeTransactionalItemsFor(targetInstance: AnyRef) = {
     require(targetInstance != null)
     var maps:    List[TransactionalMap[_, _]] = Nil
     var refs:    List[TransactionalRef[_]] = Nil
@@ -134,7 +130,10 @@ trait TransactionManagement extends Logging {
     }
 
     // start the search for transactional items, crawl the class hierarchy up until we reach Object
-    getTransactionalItemsFor(targetInstance.getClass)
+    val (m, v, r) = getTransactionalItemsFor(targetInstance.getClass)
+    changeSet.maps = m
+    changeSet.vectors = v
+    changeSet.refs = r
   }
 
   /*