[jboss-cvs] JBossAS SVN: r111899 - trunk/server/src/main/java/org/jboss/web/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2011-08-02 05:21:00 -0400 (Tue, 02 Aug 2011)
New Revision: 111899

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java
Log:
[JBAS-9432]; allow for non-existent WEB-INF.


Modified: trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java	2011-08-01 22:42:23 UTC (rev 111898)
+++ trunk/server/src/main/java/org/jboss/web/deployers/WARStructure.java	2011-08-02 09:21:00 UTC (rev 111899)
@@ -21,9 +21,6 @@
  */
 package org.jboss.web.deployers;
 
-import java.io.IOException;
-import java.util.List;
-
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.structure.ContextInfo;
 import org.jboss.deployers.spi.structure.MetaDataType;
@@ -36,6 +33,9 @@
 import org.jboss.vfs.util.automount.Automounter;
 import org.jboss.vfs.util.automount.MountOption;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * WARStructure.
  * 
@@ -159,7 +159,8 @@
 
          // Add all children as locations for TLDs (except classes and lib), recursively
          webinf = file.getChild("WEB-INF");
-         if (webinf.exists())
+         boolean webinfExists = webinf.exists();
+         if (webinfExists)
          {
             List<VirtualFile> children = webinf.getChildren();
             for (VirtualFile child : children)
@@ -233,7 +234,7 @@
          }
 
          // do we include WEB-INF in classpath
-         if (includeWebInfInClasspath && webinf != null)
+         if (includeWebInfInClasspath && webinfExists)
          {
             addClassPath(structureContext, webinf, true, false, context);
          }