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

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

Author: remy.maucherat at jboss.com
Date: 2009-10-22 11:54:26 -0400 (Thu, 22 Oct 2009)
New Revision: 95420

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- JBAS-7398: add null checks.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-22 15:51:46 UTC (rev 95419)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-22 15:54:26 UTC (rev 95420)
@@ -1190,7 +1190,7 @@
       JBossWebMetaData metaData = metaDataLocal.get();
       
       // Process Servlet API related annotations that were dependent on Servlet declarations
-      if (ok && !context.getIgnoreAnnotations())
+      if (ok && !context.getIgnoreAnnotations() && (metaData != null))
       {
          // Resolve type specific annotations to their corresponding Servlet components
          metaData.resolveAnnotations();
@@ -1208,7 +1208,7 @@
          validateSecurityRoles();
       }
       
-      if (ok)
+      if (ok && (metaData != null))
       {
          // Resolve run as
          metaData.resolveRunAs();
@@ -1221,9 +1221,10 @@
       }
 
       // Find and configure overlays
-      if (ok) {
+      DeploymentUnit deploymentUnit = deploymentUnitLocal.get();
+      if (ok && (deploymentUnit != null)) {
          Set<VirtualFile> overlays = (Set<VirtualFile>) 
-            deploymentUnitLocal.get().getAttachment(MergedJBossWebMetaDataDeployer.WEB_OVERLAYS_ATTACHMENT_NAME);
+            deploymentUnit.getAttachment(MergedJBossWebMetaDataDeployer.WEB_OVERLAYS_ATTACHMENT_NAME);
          if (overlays != null)
          {
             if (context.getResources() instanceof ProxyDirContext) {