tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: ensure to launch AfterApplicationCreated in app loader
Date Fri, 07 Nov 2014 15:29:06 GMT
Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 6da1f813a -> dfd13e80e


ensure to launch AfterApplicationCreated in app loader


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dfd13e80
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dfd13e80
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dfd13e80

Branch: refs/heads/tomee-1.7.x
Commit: dfd13e80e0912303f09235c5a0fa32c247bc4535
Parents: 6da1f81
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Fri Nov 7 15:25:54 2014 +0000
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Fri Nov 7 15:25:54 2014 +0000

----------------------------------------------------------------------
 .../apache/tomee/catalina/TomcatWebAppBuilder.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/dfd13e80/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index b9e13cc..747e526 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -1642,17 +1642,17 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener,
Pare
         } catch (final NamingException e) {
             // no-op
         } finally {
+            // required for Pojo Web Services because when Assembler creates the application
+            // the CoreContainerSystem does not contain the WebContext
+            // see also the start method getContainerSystem().addWebDeployment(webContext);
+            for (final WebAppInfo webApp : contextInfo.appInfo.webApps) {
+                SystemInstance.get().fireEvent(new AfterApplicationCreated(contextInfo.appInfo,
webApp));
+            }
+
             thread.setContextClassLoader(originalLoader);
             ContextAccessController.setReadOnly(listenerName);
         }
 
-        // required for Pojo Web Services because when Assembler creates the application
-        // the CoreContainerSystem does not contain the WebContext
-        // see also the start method getContainerSystem().addWebDeployment(webContext);
-        for (final WebAppInfo webApp : contextInfo.appInfo.webApps) {
-            SystemInstance.get().fireEvent(new AfterApplicationCreated(contextInfo.appInfo,
webApp));
-        }
-
         if (!TomcatVersion.hasAnnotationProcessingSupport()) {
             try {
                 final Context compEnv = (Context) ContextBindings.getClassLoader().lookup("comp/env");


Mime
View raw message