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

[Manik Surtani]

  User: msurtani
  Date: 07/01/29 19:11:36

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  wc
  
  Revision  Changes    Path
  1.40      +4 -3      JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -b -r1.39 -r1.40
  --- CacheImpl.java	29 Jan 2007 05:10:28 -0000	1.39
  +++ CacheImpl.java	30 Jan 2007 00:11:35 -0000	1.40
  @@ -2305,15 +2305,16 @@
         // remove subtree from parent
         if (eviction || configuration.isNodeLockingOptimistic())
         {
  -         found = parent_node.removeChildDirect(n.getFqn().getLastElement());
  +         // if there is no parent node and the fqn is root, found == true otherwise found == false.
  +         found = parent_node == null ? fqn.isRoot() : parent_node.removeChildDirect(n.getFqn().getLastElement());
         }
         else
         {
  -         found = (n.isDeleted() == false);
  +         found = !n.isDeleted();
            n.markAsDeleted(true);
         }
   
  -      if (eviction)
  +      if (eviction && parent_node != null)
         {
            parent_node.setChildrenLoaded(false);
         }