tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r583895 - /tomcat/tc6.0.x/trunk/STATUS
Date Thu, 11 Oct 2007 17:50:43 GMT
Author: remm
Date: Thu Oct 11 10:50:42 2007
New Revision: 583895

URL: http://svn.apache.org/viewvc?rev=583895&view=rev
Log:
- Clarify stop patch (inline, it's very small).

Modified:
    tomcat/tc6.0.x/trunk/STATUS

Modified: tomcat/tc6.0.x/trunk/STATUS
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=583895&r1=583894&r2=583895&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Thu Oct 11 10:50:42 2007
@@ -36,7 +36,32 @@
   -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.



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


Mime
View raw message