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

[Manik Surtani]

  User: msurtani
  Date: 06/12/20 11:04:02

  Modified:    src/org/jboss/cache   TreeCache.java NodeImpl.java
  Log:
  fixed getChildren()
  
  Revision  Changes    Path
  1.297     +6 -6      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.296
  retrieving revision 1.297
  diff -u -b -r1.296 -r1.297
  --- TreeCache.java	20 Dec 2006 09:07:15 -0000	1.296
  +++ TreeCache.java	20 Dec 2006 16:04:02 -0000	1.297
  @@ -95,7 +95,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.296 2006/12/20 09:07:15 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.297 2006/12/20 16:04:02 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -1842,19 +1842,19 @@
       */
      public int getNumberOfLocksHeld()
      {
  -      return numLocks(root.getNodeSPI());
  +      return numLocks(root);
      }
   
  -   private int numLocks(NodeSPI n)
  +   private int numLocks(Node n)
      {
         int num = 0;
  -      if (n.getLock().isLocked())
  +      if (n.getNodeSPI().getLock().isLocked())
         {
            num++;
         }
  -      for (Node cn : n.getChildrenMap().values())
  +      for (Node cn : ((NodeImpl) n).getChildren(true))
         {
  -         num += numLocks(cn.getNodeSPI());
  +         num += numLocks(cn);
         }
         return num;
      }
  
  
  
  1.27      +17 -1     JBossCache/src/org/jboss/cache/NodeImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/NodeImpl.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- NodeImpl.java	15 Dec 2006 17:30:32 -0000	1.26
  +++ NodeImpl.java	20 Dec 2006 16:04:02 -0000	1.27
  @@ -785,7 +785,21 @@
   
      public Set<Node> getChildren()
      {
  -      return new ChildrenNodes<Node>(false);
  +      //return new ChildrenNodes<Node>(false);
  +      // strip out deleted child nodes...
  +      if (children == null || children.size() == 0) return new HashSet<Node>();
  +
  +      Set<Node> exclDeleted = new HashSet<Node>();
  +      for (AbstractNode n : children.values())
  +      {
  +         if (!n.isDeleted()) exclDeleted.add(n);
  +      }
  +      return exclDeleted;
  +   }
  +
  +   public Set<Node> getChildren(boolean includeMarkedForRemoval)
  +   {
  +      return includeMarkedForRemoval ? new HashSet<Node>(children.values()) : getChildren();
      }
   
      public synchronized Map<Object, Object> getRawData()
  @@ -904,6 +918,7 @@
   
      }
   
  +   /*
      private class ChildrenNodes<T> extends AbstractSet
      {
         private boolean includeDeleted;
  @@ -947,5 +962,6 @@
         }
   
      }
  +   */
   
   }