Author: markt
Date: Sun Mar 28 10:07:42 2010
New Revision: 928370
URL: http://svn.apache.org/viewvc?rev=928370&view=rev
Log:
MUST_STOP is also a valid state from which to transition to STOPPING_PREP
Modified:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=928370&r1=928369&r2=928370&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Sun Mar 28
10:07:42 2010
@@ -191,7 +191,8 @@ public abstract class LifecycleBase impl
}
if (!state.equals(LifecycleState.STARTED) &&
- !state.equals(LifecycleState.FAILED)) {
+ !state.equals(LifecycleState.FAILED) &&
+ !state.equals(LifecycleState.MUST_STOP)) {
invalidTransition(Lifecycle.BEFORE_STOP_EVENT);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
