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

[Manik Surtani]

  User: msurtani
  Date: 06/12/05 12:25:45

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_3_0
                        TreeCache.java
  Log:
  Some fine-tunings
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.142.2.7 +12 -10    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.6
  retrieving revision 1.142.2.7
  diff -u -b -r1.142.2.6 -r1.142.2.7
  --- TreeCache.java	30 Nov 2006 14:18:04 -0000	1.142.2.6
  +++ TreeCache.java	5 Dec 2006 17:25:45 -0000	1.142.2.7
  @@ -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.6 2006/11/30 14:18:04 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.142.2.7 2006/12/05 17:25:45 msurtani Exp $
    *          <p/>
    */
   public class TreeCache extends ServiceMBeanSupport implements TreeCacheMBean, Cloneable, MembershipListener
  @@ -4198,10 +4198,12 @@
         }
      }
   
  -   private void scrubRemoveMarker(TreeNode n, boolean deep)
  +   public void scrubRemoveMarker(TreeNode n, boolean deep)
      {
         n.remove(REMOVAL_MARKER);
         // unmark children as well.
  +      if (deep)
  +      {
         Map children = n.getChildren();
         if (children != null && !children.isEmpty())
         {
  @@ -4212,10 +4214,10 @@
               scrubRemoveMarker((TreeNode) i.next(), true);
            }
         }
  -
  +      }
      }
   
  -   private boolean isMarkedForRemoval(TreeNode n)
  +   public boolean isMarkedForRemoval(TreeNode n)
      {
         return n.containsKey(REMOVAL_MARKER);
      }