Author: manik.surtani(a)jboss.com Date: 2009-01-09 10:01:53 -0500 (Fri, 09 Jan 2009) New Revision: 7428 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 14:08:22 UTC (rev 7427) +++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2009-01-09 15:01:53 UTC (rev 7428) @@ -172,8 +172,11 @@ private void reset() { backup = null; - super.setChildrenLoaded(isFlagSet(ORIG_CHILDREN_LOADED)); - super.setDataLoaded(isFlagSet(ORIG_DATA_LOADED)); + if (node != null) + { + super.setChildrenLoaded(isFlagSet(ORIG_CHILDREN_LOADED)); + super.setDataLoaded(isFlagSet(ORIG_DATA_LOADED)); + } flags = 0; }