From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 28 Mar 2010 10:07:42 +0000 (+0000)
Subject: MUST_STOP is also a valid state from which to transition to STOPPING_PREP
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fd2acf0c2ec39bf378662f6adb97362bb72df86e;p=tomcat7.0

MUST_STOP is also a valid state from which to transition to STOPPING_PREP

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

diff --git a/java/org/apache/catalina/util/LifecycleBase.java b/java/org/apache/catalina/util/LifecycleBase.java
index 5f270be32..66653a3f6 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -191,7 +191,8 @@ public abstract class LifecycleBase implements Lifecycle {
             }
 
             if (!state.equals(LifecycleState.STARTED) &&
-                    !state.equals(LifecycleState.FAILED)) {
+                    !state.equals(LifecycleState.FAILED) &&
+                    !state.equals(LifecycleState.MUST_STOP)) {
                 invalidTransition(Lifecycle.BEFORE_STOP_EVENT);
             }