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

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 06/12/20 17:27:08

  Modified:    src/org/jboss/cache  NodeImpl.java
  Log:
  fix NPE
  
  Revision  Changes    Path
  1.28      +15 -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.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- NodeImpl.java	20 Dec 2006 16:04:02 -0000	1.27
  +++ NodeImpl.java	20 Dec 2006 22:27:08 -0000	1.28
  @@ -799,7 +799,21 @@
   
      public Set<Node> getChildren(boolean includeMarkedForRemoval)
      {
  -      return includeMarkedForRemoval ? new HashSet<Node>(children.values()) : getChildren();
  +      if (includeMarkedForRemoval)
  +      {
  +         if (children != null && !children.isEmpty())
  +         {
  +            return new HashSet<Node>(children.values());
  +         }
  +         else
  +         {
  +            return new HashSet<Node>();
  +         }
  +      }
  +      else
  +      {
  +         return getChildren();
  +      }
      }
   
      public synchronized Map<Object, Object> getRawData()