Repository: tomee Updated Branches: refs/heads/master 569da988b -> 426e0c14f
ServletContext not accessible during JAX-RS app deployment. Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/426e0c14 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/426e0c14 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/426e0c14 Branch: refs/heads/master Commit: 426e0c14fede5ee5907e43e1c46e2fd51c904412 Parents: 569da98 Author: Roberto Cortez <radcor...@yahoo.com> Authored: Thu Oct 4 00:39:32 2018 +0100 Committer: Roberto Cortez <radcor...@yahoo.com> Committed: Thu Oct 4 00:39:59 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/426e0c14/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 3b69aa5..127283f 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 @@ -1767,8 +1767,13 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare // 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)); + try { + servletContextHandler.getContexts().put(classLoader, standardContext.getServletContext()); + for (final WebAppInfo webApp : contextInfo.appInfo.webApps) { + SystemInstance.get().fireEvent(new AfterApplicationCreated(contextInfo.appInfo, webApp)); + } + } finally { + servletContextHandler.getContexts().remove(classLoader); } thread.setContextClassLoader(originalLoader);
