[jbosscache-commits] JBoss Cache SVN: r7915 - in core/trunk/src/main/java/org/jboss/cache: mvcc and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-03-18 12:38:48 -0400 (Wed, 18 Mar 2009)
New Revision: 7915

Modified:
   core/trunk/src/main/java/org/jboss/cache/AbstractNode.java
   core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
Log:
JBCACHE-1496 -  Typo in ReadCommittedNode.Flags.ORIG_CHILDREN_LOADED enum mask

Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/AbstractNode.java	2009-03-18 15:48:28 UTC (rev 7914)
+++ core/trunk/src/main/java/org/jboss/cache/AbstractNode.java	2009-03-18 16:38:48 UTC (rev 7915)
@@ -59,47 +59,47 @@
       /**
        * All children are loaded from the cache loader if this flag is present.
        */
-      CHILDREN_LOADED(0x1),
+      CHILDREN_LOADED(1),
       /**
        * Data is loaded from the cache loader if this flag is present.
        */
-      DATA_LOADED(0x2),
+      DATA_LOADED(1<<1),
       /**
        * Node is write-locked when children are added or removed if this flag is enabled.
        */
-      LOCK_FOR_CHILD_INSERT_REMOVE(0x4),
+      LOCK_FOR_CHILD_INSERT_REMOVE(1<<2),
       /**
        * Node is valid if this flag is present.
        */
-      VALID(0x8),
+      VALID(1<<3),
       /**
        * Node has been removed.
        */
-      REMOVED(0x10),
+      REMOVED(1<<4),
       /**
        * NOde is resident and excluded from evictions
        */
-      RESIDENT(0x20),
+      RESIDENT(1<<5),
       /**
        * Specific to Optimistic Locking Workspace nodes - set if a node has been modified in a workspace.
        */
-      MODIFIED_IN_WORKSPACE(0x40),
+      MODIFIED_IN_WORKSPACE(1<<6),
       /**
        * Specific to Optimistic Locking Workspace nodes - set if a node has been created in a workspace.
        */
-      CREATED_IN_WORKSPACE(0x80),
+      CREATED_IN_WORKSPACE(1<<7),
       /**
        * Specific to Optimistic Locking Workspace nodes - set if a node has added or removed children in a workspace.
        */
-      CHILDREN_MODIFIED_IN_WORKSPACE(0x100),
+      CHILDREN_MODIFIED_IN_WORKSPACE(1<<8),
       /**
        * Specific to Optimistic Locking Workspace nodes - set if an implicit version is associated with this node.
        */
-      VERSIONING_IMPLICIT(0x200),
+      VERSIONING_IMPLICIT(1<<9),
       /**
        * Specific to Optimistic Locking Workspace nodes - set if a node has been resurrected in a workspace.
        */
-      RESURRECTED_IN_WORKSPACE(0x400);
+      RESURRECTED_IN_WORKSPACE(1<<10);
 
       protected final short mask;
 

Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java	2009-03-18 15:48:28 UTC (rev 7914)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java	2009-03-18 16:38:48 UTC (rev 7915)
@@ -50,7 +50,7 @@
 
    protected static enum Flags
    {
-      CHANGED(0x1), CREATED(0x2), DELETED(0x4), ORIG_DATA_LOADED(0x8), ORIG_CHILDREN_LOADED(0x16);
+      CHANGED(1), CREATED(1<<1), DELETED(1<<2), ORIG_DATA_LOADED(1<<3), ORIG_CHILDREN_LOADED(1<<4);
       final byte mask;
 
       Flags(int mask)