From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 11 Oct 2007 17:50:42 +0000 (+0000)
Subject: - Clarify stop patch (inline, it's very small).
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=2fee3c0823c1e44512237fbb28b7a4ecc9c4b0a7;p=tomcat7.0

- Clarify stop patch (inline, it's very small).

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

diff --git a/STATUS b/STATUS
index cc0bdba03..b72aacfe2 100644
--- a/STATUS
+++ b/STATUS
@@ -36,7 +36,32 @@ PATCHES PROPOSED TO BACKPORT:
   -1: 
 
 * Call StopAwait at StandardServer.stop as port==-1
-  +1: pero
+
+Index: java/org/apache/catalina/core/StandardServer.java
+===================================================================
+--- java/org/apache/catalina/core/StandardServer.java	(revision 583866)
++++ java/org/apache/catalina/core/StandardServer.java	(working copy)
+@@ -360,7 +360,7 @@
+         if( port==-1 ) {
+             while( true ) {
+                 try {
+-                    Thread.sleep( 100000 );
++                    Thread.sleep( 10000 );
+                 } catch( InterruptedException ex ) {
+                 }
+                 if( stopAwait ) return;
+@@ -747,6 +747,9 @@
+         // Notify our interested LifecycleListeners
+         lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
+ 
++        if (port == -1)
++            stopAwait();
++
+     }
+ 
+     public void init() throws Exception {
+
+  +1: pero, remm
   -1: No link to proposed fix given.
   
 * Arrange doc of connectors.