svn commit: r1352040 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Wed Jun 20 10:46:02 2012
New Revision: 1352040

URL: http://svn.apache.org/viewvc?rev=1352040&view=rev
Log:
when using webapp mode to deploy tomee the context was known too lately to get 
back the deployment exception

Modified:
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1352040&r1=1352039&r2=1352040&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Wed Jun 20 10:46:02 2012
@@ -666,6 +666,8 @@ public class TomcatWebAppBuilder impleme
             if (appModule != null) {
                 try {
                     contextInfo = 
addContextInfo(standardContext.getHostname(), standardContext);
+                    contextInfo.standardContext = standardContext; // ensure 
to do it before an exception can be thrown
+
                     final AppInfo appInfo = 
configurationFactory.configureApplication(appModule);
                     contextInfo.appInfo = appInfo;
 
@@ -684,16 +686,10 @@ public class TomcatWebAppBuilder impleme
                     return;
                 }
             }
+        } else {
+            contextInfo.standardContext = standardContext;
         }
 
-        if (appContext == null) {
-            String contextRoot = standardContext.getName();
-            if (contextRoot.startsWith("/")) {
-                contextRoot = contextRoot.replaceAll("^/+", "");
-            }
-        }
-
-        contextInfo.standardContext = standardContext;
 
         WebAppInfo webAppInfo = null;
         // appInfo is null when deployment fails
@@ -844,6 +840,10 @@ public class TomcatWebAppBuilder impleme
     }
 
     private static LazyStopWebappClassLoader lazyClassLoader(final Container 
child) {
+        if (child == null) {
+            return null;
+        }
+
         final Loader loader = child.getLoader();
         if (loader == null || !(loader instanceof LazyStopLoader)) {
             return null;