Repository: tomee Updated Branches: refs/heads/tomee-7.0.0-M1 4966cef13 -> ffa109cc3
fixing build/style Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2e566b49 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2e566b49 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2e566b49 Branch: refs/heads/tomee-7.0.0-M1 Commit: 2e566b49084ae237411e8c25558d2e89a092fe9e Parents: 9a32caf Author: Romain Manni-Bucau <[email protected]> Authored: Tue Dec 1 22:50:29 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Tue Dec 1 22:50:44 2015 +0100 ---------------------------------------------------------------------- .../apache/openejb/core/ivm/naming/LazyObjectReference.java | 2 +- .../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 6 ++++-- .../src/main/java/org/apache/tomee/overlay/Deployer.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2e566b49/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java index 80ab060..a8b0b9e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/LazyObjectReference.java @@ -48,7 +48,7 @@ public class LazyObjectReference<T> extends Reference { return instance != null; } - public static class LazyNamingException extends NamingException { + public static final class LazyNamingException extends NamingException { private LazyNamingException(final String message) { super(message); } http://git-wip-us.apache.org/repos/asf/tomee/blob/2e566b49/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 8949d97..a45de69 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 @@ -1065,8 +1065,10 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare contextTransaction.setProperty(org.apache.naming.factory.Constants.FACTORY, UserTransactionFactory.class.getName()); standardContext.getNamingResources().setTransaction(contextTransaction); - // ensure NamingContext is available for eager usage (@Observes @Initialized(ApplicationScoped) for instance) - standardContext.getNamingContextListener().lifecycleEvent(event); + if (event != null) { + // ensure NamingContext is available for eager usage (@Observes @Initialized(ApplicationScoped) for instance) + standardContext.getNamingContextListener().lifecycleEvent(event); + } TomcatHelper.configureJarScanner(standardContext); http://git-wip-us.apache.org/repos/asf/tomee/blob/2e566b49/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java b/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java index 92ac728..d104af2 100644 --- a/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java +++ b/tomee/tomee-overlay-runner/src/main/java/org/apache/tomee/overlay/Deployer.java @@ -27,7 +27,7 @@ import javax.servlet.ServletContext; public final class Deployer { public static void deploy(final ServletContext ctx) { final TomcatWebAppBuilder builder = SystemInstance.get().getComponent(TomcatWebAppBuilder.class); - builder.configureStart(StandardContext.class.cast(Reflections.get(Reflections.get(ctx, "context"), "context"))); + builder.configureStart(null, StandardContext.class.cast(Reflections.get(Reflections.get(ctx, "context"), "context"))); } private Deployer() {
