Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49132

Need to start JNDI before listeners are called

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@937542 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index 9e8dfec..94a9518 100644 (file)
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -212,7 +212,7 @@ public class NamingContextListener
             return;
         }
 
-        if (Lifecycle.START_EVENT.equals(event.getType())) {
+        if (Lifecycle.CONFIGURE_START_EVENT.equals(event.getType())) {
 
             if (initialized)
                 return;
@@ -272,7 +272,7 @@ public class NamingContextListener
 
             initialized = true;
 
-        } else if (Lifecycle.STOP_EVENT.equals(event.getType())) {
+        } else if (Lifecycle.CONFIGURE_STOP_EVENT.equals(event.getType())) {
 
             if (!initialized)
                 return;