You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/11/29 14:41:07 UTC

svn commit: r1040111 - in /tomcat/trunk: java/org/apache/catalina/startup/Embedded.java webapps/docs/changelog.xml

Author: markt
Date: Mon Nov 29 13:41:07 2010
New Revision: 1040111

URL: http://svn.apache.org/viewvc?rev=1040111&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50358
Set correct state when stopping

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=1040111&r1=1040110&r2=1040111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Mon Nov 29 13:41:07 2010
@@ -845,7 +845,7 @@ public class Embedded  extends StandardS
             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++) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1040111&r1=1040110&r2=1040111&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 29 13:41:07 2010
@@ -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">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org