Author: remy.maucherat(a)jboss.com Date: 2007-10-11 13:56:35 -0400 (Thu, 11 Oct 2007) New Revision: 307 Modified: trunk/java/org/apache/catalina/core/StandardServer.java Log: - Minor stopAwait fix. Modified: trunk/java/org/apache/catalina/core/StandardServer.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardServer.java 2007-10-11 15:29:20 UTC (rev 306) +++ trunk/java/org/apache/catalina/core/StandardServer.java 2007-10-11 17:56:35 UTC (rev 307) @@ -42,12 +42,11 @@ import org.apache.catalina.Service; import org.apache.catalina.deploy.NamingResources; import org.apache.catalina.util.LifecycleSupport; +import org.apache.catalina.util.ServerInfo; import org.apache.catalina.util.StringManager; -import org.apache.catalina.util.ServerInfo; import org.apache.tomcat.util.buf.StringCache; import org.apache.tomcat.util.modeler.Registry; import org.jboss.logging.Logger; -import org.jboss.logging.Logger; @@ -360,7 +359,7 @@ if( port==-1 ) { while( true ) { try { - Thread.sleep( 100000 ); + Thread.sleep(10000); } catch( InterruptedException ex ) { } if( stopAwait ) return; @@ -747,6 +746,9 @@ // Notify our interested LifecycleListeners lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null); + if (port == -1) + stopAwait(); + } public void init() throws Exception {