You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ra...@apache.org on 2018/10/09 17:42:22 UTC
tomee git commit: ServletContext not accessible during JAX-RS app
deployment only for the current webapp.
Repository: tomee
Updated Branches:
refs/heads/master 99824e0c6 -> 795fa40bc
ServletContext not accessible during JAX-RS app deployment only for the current webapp.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/795fa40b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/795fa40b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/795fa40b
Branch: refs/heads/master
Commit: 795fa40bc76581a1a923805527a780e02c9bf91f
Parents: 99824e0
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Oct 9 17:00:24 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Tue Oct 9 17:00:24 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/795fa40b/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 127283f..123c8ea 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
@@ -1769,8 +1769,13 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
// see also the start method getContainerSystem().addWebDeployment(webContext);
try {
servletContextHandler.getContexts().put(classLoader, standardContext.getServletContext());
- for (final WebAppInfo webApp : contextInfo.appInfo.webApps) {
- SystemInstance.get().fireEvent(new AfterApplicationCreated(contextInfo.appInfo, webApp));
+
+ for (final WebAppInfo webAppInfo : contextInfo.appInfo.webApps) {
+ final String wId = getId(webAppInfo.host, webAppInfo.contextRoot, contextInfo.version);
+ if (id.equals(wId)) {
+ SystemInstance.get().fireEvent(new AfterApplicationCreated(contextInfo.appInfo, webAppInfo));
+ break;
+ }
}
} finally {
servletContextHandler.getContexts().remove(classLoader);