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

[Manik Surtani]

  User: msurtani
  Date: 06/11/30 09:18:04

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_3_0
                        TreeCache.java
  Log:
  wc
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.142.2.6 +13 -3     JBossCache/src/org/jboss/cache/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/TreeCache.java,v
  retrieving revision 1.142.2.5
  retrieving revision 1.142.2.6
  diff -u -b -r1.142.2.5 -r1.142.2.6
  --- TreeCache.java	29 Nov 2006 16:04:40 -0000	1.142.2.5
  +++ TreeCache.java	30 Nov 2006 14:18:04 -0000	1.142.2.6
  @@ -60,7 +60,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.142.2.5 2006/11/29 16:04:40 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.142.2.6 2006/11/30 14:18:04 msurtani Exp $
    *          <p/>
    */
   public class TreeCache extends ServiceMBeanSupport implements TreeCacheMBean, Cloneable, MembershipListener
  @@ -4233,8 +4233,18 @@
         if (log.isDebugEnabled()) log.debug("Performing a real remove for node " + f + ", marked for removal.");
         if (skipMarkerCheck || isMarkedForRemoval(n))
         {
  +         if (n.getFqn().isRoot())
  +         {
  +            // do not actually delete; just remove deletion marker
  +            scrubRemoveMarker(n, false);
  +            // but now remove all children, since the call has been to remove("/")
  +            n.removeAllChildren();
  +         }
  +         else
  +         {
            n.getParent().removeChild(n.getName());
         }
  +      }
         else
         {
            if (log.isDebugEnabled()) log.debug("Node " + f + " NOT marked for removal as expected, not removing!");