[jboss-cvs] system2/src/main/org/jboss/deployers/plugins ...

[Scott Stark]

  User: starksm 
  Date: 06/07/12 04:15:27

  Modified:    src/main/org/jboss/deployers/plugins  MainDeployerImpl.java
  Log:
  Handle a null parent and children files
  
  Revision  Changes    Path
  1.4       +8 -4      system2/src/main/org/jboss/deployers/plugins/MainDeployerImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MainDeployerImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/system2/src/main/org/jboss/deployers/plugins/MainDeployerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- MainDeployerImpl.java	10 Jul 2006 16:28:59 -0000	1.3
  +++ MainDeployerImpl.java	12 Jul 2006 08:15:27 -0000	1.4
  @@ -408,16 +408,20 @@
         if( accepted )
         {
            // Add the subdeployment context
  +         if( parent != null )
            parent.addSubDeployment(ctx);
   
            // For each immeadiate child, see if its a subdeployment
            VirtualFile[] children = file.getChildren();
  +         if( children != null )
  +         {
            for(VirtualFile vf : children)
            {
               if( ctx.isInClasspath(vf.getName()) == false )
                  accepted |= parse(vf, rootDeployment, ctx);
            }
         }
  +      }
         return accepted;
      }
   }