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

Set correct state when stopping

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

diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java
index e957e9f..6b7620f 100644 (file)
--- a/java/org/apache/catalina/startup/Embedded.java
+++ b/java/org/apache/catalina/startup/Embedded.java
@@ -845,7 +845,7 @@ public class Embedded  extends StandardService {
             log.debug("Stopping embedded server");
 
         fireLifecycleEvent(STOP_EVENT, null);
-        setState(LifecycleState.STARTING);
+        setState(LifecycleState.STOPPING);
 
         // Stop our defined Connectors first
         for (int i = 0; i < connectors.length; i++) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dbbe446..8cd6c59 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -58,6 +58,10 @@
         Further performance improvements to session ID generation. Remove legacy
         configuration options that are no longer required.
       </update>
+      <fix>
+        <bug>50358</bug>: Set the correct LifecycleState when stopping instances
+        of the deprecated Embedded class. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">