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

[Manik Surtani]

  User: msurtani
  Date: 06/12/05 12:16:35

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  Ported stuff from 1.3.0.SP4
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.28 +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.195.2.27
  retrieving revision 1.195.2.28
  diff -u -b -r1.195.2.27 -r1.195.2.28
  --- TreeCache.java	5 Dec 2006 15:27:52 -0000	1.195.2.27
  +++ TreeCache.java	5 Dec 2006 17:16:35 -0000	1.195.2.28
  @@ -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.27 2006/12/05 15:27:52 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.28 2006/12/05 17:16:35 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -4152,10 +4152,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())
          {
  @@ -4166,10 +4168,10 @@
                scrubRemoveMarker((TreeNode) i.next(), true);
             }
          }
  -
  +       }
       }
   
  -    private boolean isMarkedForRemoval(TreeNode n)
  +    public boolean isMarkedForRemoval(TreeNode n)
       {
          return n.containsKey(REMOVAL_MARKER);
       }