From 624239d695b90a1e7d7f3a5c6d2311c4e3da1622 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 29 Nov 2010 13:41:07 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/startup/Embedded.java | 2 +- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java index e957e9f21..6b7620f88 100644 --- 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 dbbe446dd..8cd6c5999 100644 --- 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. + + 50358: Set the correct LifecycleState when stopping instances + of the deprecated Embedded class. (markt) + -- 2.11.0