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:07 GMT
Repository: tomee
Updated Branches:
  refs/heads/develop 5971b1a85 -> 05d0f7b54


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/05d0f7b5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/05d0f7b5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/05d0f7b5

Branch: refs/heads/develop
Commit: 05d0f7b5476aab060dc05dc7c1f73d4e9d926c0b
Parents: 5971b1a
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Fri Nov 7 15:25:52 2014 +0000
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Fri Nov 7 15:25:52 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/05d0f7b5/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 4058e19..ba0bcc2 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
@@ -1589,17 +1589,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));
-        }
-
         // owb integration filters
         final WebBeansContext webBeansContext = getWebBeansContext(contextInfo);
         if (webBeansContext != null) {


Mime
View raw message