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

[Manik Surtani]

  User: msurtani
  Date: 07/03/07 09:17:34

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  evict subtree to not attempt removal of root node
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.54 +3 -3      JBossCache/src/org/jboss/cache/Attic/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Attic/TreeCache.java,v
  retrieving revision 1.195.2.53
  retrieving revision 1.195.2.54
  diff -u -b -r1.195.2.53 -r1.195.2.54
  --- TreeCache.java	6 Mar 2007 20:09:34 -0000	1.195.2.53
  +++ TreeCache.java	7 Mar 2007 14:17:34 -0000	1.195.2.54
  @@ -99,7 +99,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.195.2.53 2007/03/06 20:09:34 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.54 2007/03/07 14:17:34 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -2479,8 +2479,8 @@
            }
         }
   
  -      // Remove the root node of the subtree
  -      _remove(null, subtree, false, false, true);
  +      // Remove the root node of the subtree (unless it is root!)
  +      if (!subtree.isRoot()) _remove(null, subtree, false, false, true);
   
      }