[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Elias Ross]

  User: genman  
  Date: 06/11/25 13:40:18

  Modified:    src/org/jboss/cache  OptimisticTreeNode.java
  Log:
  JBCACHE-867 fix regression in opt tree node
  
  Revision  Changes    Path
  1.16      +5 -5      JBossCache/src/org/jboss/cache/OptimisticTreeNode.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticTreeNode.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/OptimisticTreeNode.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- OptimisticTreeNode.java	20 Nov 2006 03:53:54 -0000	1.15
  +++ OptimisticTreeNode.java	25 Nov 2006 18:40:18 -0000	1.16
  @@ -28,8 +28,8 @@
        * Although this object has a reference to the TreeCache, the optimistic
        * node is actually disconnected from the TreeCache itself.
        * The parent could be looked up from the TransactionWorkspace.
  -    private Node parent;
        */
  +    private Node parent;
   
       public OptimisticTreeNode(Object childName, Fqn fqn, Node parent, Map data, DataVersion version, CacheSPI cache)
       {
  @@ -46,9 +46,9 @@
           super(childName, fqn, data, mapSafe, cache);
           if (version == null)
              throw new NullPointerException("version");
  -        //if (parent == null)
  -           //throw new NullPointerException("parent");        
  -        //this.parent = parent;
  +        if (parent == null && !fqn.isRoot())
  +           throw new NullPointerException("parent");        
  +        this.parent = parent;
           this.version = version;
       }
   
  @@ -68,11 +68,11 @@
   
       /**
        * Returns the parent.
  +     */ 
       public Node getParent()
       {
          return parent;
       }
  -     */
       
       /**
        * Sets the version id of this node.