[jboss-cvs] JBossAS SVN: r93351 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2009-09-10 06:46:53 -0400 (Thu, 10 Sep 2009)
New Revision: 93351

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Fix processing of overlays when some deployers are not there.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-09-10 10:39:17 UTC (rev 93350)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-09-10 10:46:53 UTC (rev 93351)
@@ -1011,22 +1011,25 @@
 
       // Find and configure overlays
       if (ok) {
-         if (context.getResources() instanceof ProxyDirContext) {
-            Set<VirtualFile> overlays = (Set<VirtualFile>) 
-               deploymentUnitLocal.get().getAttachment(MergedJBossWebMetaDataDeployer.WEB_OVERLAYS_ATTACHMENT_NAME);
-            ProxyDirContext resources = (ProxyDirContext) context.getResources();
-            for (VirtualFile overlay : overlays)
+         Set<VirtualFile> overlays = (Set<VirtualFile>) 
+            deploymentUnitLocal.get().getAttachment(MergedJBossWebMetaDataDeployer.WEB_OVERLAYS_ATTACHMENT_NAME);
+         if (overlays != null)
+         {
+            if (context.getResources() instanceof ProxyDirContext) {
+               ProxyDirContext resources = (ProxyDirContext) context.getResources();
+               for (VirtualFile overlay : overlays)
+               {
+                  VFSDirContext vfsDirContext = new VFSDirContext(overlay);
+                  resources.addOverlay(vfsDirContext);
+               }
+            }
+            else if (overlays.size() > 0)
             {
-               VFSDirContext vfsDirContext = new VFSDirContext(overlay);
-               resources.addOverlay(vfsDirContext);
+               // Error, overlays need a ProxyDirContext to compose results
+               log.error(sm.getString("contextConfig.noOverlay", context.getName()));
+               ok = false;
             }
          }
-         else
-         {
-            // Error, overlays need a ProxyDirContext to compose results
-            log.error(sm.getString("contextConfig.noOverlay", context.getName()));
-            ok = false;
-         }
       }
 
       // Make our application unavailable if problems were encountered