Author: markt
Date: Sat Apr 24 19:21:14 2010
New Revision: 937678
URL: http://svn.apache.org/viewvc?rev=937678&view=rev
Log:
Restore global JNDI support broken in r937542
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=937678&r1=937677&r2=937678&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Sat Apr 24
19:21:14 2010
@@ -654,6 +654,7 @@ public final class StandardServer extend
@Override
protected void startInternal() throws LifecycleException {
+ fireLifecycleEvent(CONFIGURE_START_EVENT, null);
setState(LifecycleState.STARTING);
// Start our defined Services
@@ -676,7 +677,8 @@ public final class StandardServer extend
protected void stopInternal() throws LifecycleException {
setState(LifecycleState.STOPPING);
-
+ fireLifecycleEvent(CONFIGURE_STOP_EVENT, null);
+
// Stop our defined Services
for (int i = 0; i < services.length; i++) {
services[i].stop();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
