svn commit: r1176012 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Sep 26 19:48:13 2011
New Revision: 1176012

URL: http://svn.apache.org/viewvc?rev=1176012&view=rev
Log:
skipping afterStart method in tomcatwebappbuilder if contextInfo is null (openejb webapp using LoaderServlet)

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=1176012&r1=1176011&r2=1176012&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Mon Sep 26 19:48:13 2011
@@ -232,7 +232,6 @@ public class TomcatWebAppBuilder impleme
                     ContextInfo contextInfo = addContextInfo(host, standardContext);
                     contextInfo.appInfo = appInfo;
                     contextInfo.deployer = deployer;
-                    contextInfo.standardContext = standardContext;
                     deployer.manageApp(standardContext);
                 }
             }
@@ -491,7 +490,6 @@ public class TomcatWebAppBuilder impleme
                 logger.error("Error merging Java EE JNDI entries in to war " + standardContext.getPath() + ": Exception: " + e.getMessage(), e);
             }
 
-            // TODO RMB: JspFactory.setDefaultFactory();
             JspFactory factory = JspFactory.getDefaultFactory();
             if (factory != null) {
                 JspApplicationContext applicationCtx = factory.getJspApplicationContext(standardContext.getServletContext());
@@ -521,6 +519,8 @@ public class TomcatWebAppBuilder impleme
         ContextInfo contextInfo = getContextInfo(standardContext);
         if (contextInfo != null && contextInfo.appInfo == null) {
             return;
+        } else if (contextInfo == null) { // openejb webapp loaded from the LoaderServlet
+            return;
         }
 
         // bind extra stuff at the java:comp level which can only be
@@ -1052,6 +1052,7 @@ public class TomcatWebAppBuilder impleme
         ContextInfo contextInfo = infos.get(id);
         if (contextInfo == null) {
             contextInfo = new ContextInfo();
+            contextInfo.standardContext = standardContext;
             infos.put(id, contextInfo);
         }
         return contextInfo;