[jbosscache-commits] JBoss Cache SVN: r7430 - core/trunk/src/main/java/org/jboss/cache/mvcc.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-01-09 11:38:44 -0500 (Fri, 09 Jan 2009)
New Revision: 7430

Modified:
   core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
Log:
JBCACHE-1455 -  Rollback corrupts nodes loaded from cache loader

Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java	2009-01-09 15:27:29 UTC (rev 7429)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java	2009-01-09 16:38:44 UTC (rev 7430)
@@ -172,11 +172,6 @@
    private void reset()
    {
       backup = null;
-      if (node != null)
-      {
-         super.setChildrenLoaded(isFlagSet(ORIG_CHILDREN_LOADED));
-         super.setDataLoaded(isFlagSet(ORIG_DATA_LOADED));
-      }
       flags = 0;
    }
 
@@ -232,6 +227,11 @@
    public void rollbackUpdate()
    {
       node = backup;
+      if (node != null)
+      {
+         super.setChildrenLoaded(isFlagSet(ORIG_CHILDREN_LOADED));
+         super.setDataLoaded(isFlagSet(ORIG_DATA_LOADED));
+      }
       reset();
    }