@Override added
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/97a4c61b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/97a4c61b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/97a4c61b Branch: refs/heads/master Commit: 97a4c61b41d30a6a389d07bec116d4b469fa0544 Parents: 0377eef Author: Hayri Cicek <[email protected]> Authored: Sun Sep 16 01:40:56 2018 +0200 Committer: Hayri Cicek <[email protected]> Committed: Sun Sep 16 01:40:56 2018 +0200 ---------------------------------------------------------------------- .../apache/tomee/catalina/OpenEJBNamingContextListener.java | 2 ++ .../main/java/org/apache/tomee/catalina/OpenEJBValve.java | 1 + .../main/java/org/apache/tomee/catalina/ServerListener.java | 1 + .../org/apache/tomee/catalina/TomEEContainerListener.java | 8 ++++---- 4 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/97a4c61b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java index b2dedbf..a007f6b 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBNamingContextListener.java @@ -65,6 +65,7 @@ public class OpenEJBNamingContextListener implements LifecycleListener, Property namingResources = standardServer.getGlobalNamingResources(); } + @Override public void lifecycleEvent(final LifecycleEvent event) { if (event.getLifecycle() != standardServer) { return; @@ -104,6 +105,7 @@ public class OpenEJBNamingContextListener implements LifecycleListener, Property running = false; } + @Override public void propertyChange(final PropertyChangeEvent event) { if (!running) { return; http://git-wip-us.apache.org/repos/asf/tomee/blob/97a4c61b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java index e0d12f3..896e24e 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBValve.java @@ -35,6 +35,7 @@ public class OpenEJBValve extends ValveBase { securityService = getSecurityService(); } + @Override public void invoke(final Request request, final Response response) throws IOException, ServletException { final OpenEJBSecurityListener listener = new OpenEJBSecurityListener(securityService, request); http://git-wip-us.apache.org/repos/asf/tomee/blob/97a4c61b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java index 83715dc..7120943 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java @@ -54,6 +54,7 @@ public class ServerListener implements LifecycleListener { private static final AtomicBoolean listenerInstalled = new AtomicBoolean(false); + @Override public void lifecycleEvent(final LifecycleEvent event) { if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType()) && StandardServer.class.isInstance(event.getSource())) { installServerInfo(); http://git-wip-us.apache.org/repos/asf/tomee/blob/97a4c61b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEContainerListener.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEContainerListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEContainerListener.java index f842923..fdb320f 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEContainerListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEContainerListener.java @@ -22,18 +22,18 @@ import org.apache.catalina.core.StandardContext; public class TomEEContainerListener implements ContainerListener { - private static final ThreadLocal<StandardContext> context = new ThreadLocal<StandardContext>(); + private static final ThreadLocal<StandardContext> CONTEXT = new ThreadLocal<StandardContext>(); @Override public void containerEvent(final ContainerEvent event) { if ("beforeContextInitialized".equals(event.getType())) { - context.set((StandardContext) event.getContainer()); + CONTEXT.set((StandardContext) event.getContainer()); } else if ("afterContextInitialized".equals(event.getType())) { - context.remove(); + CONTEXT.remove(); } } public static StandardContext get() { - return context.get(); + return CONTEXT.get(); } }
