tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r585606 - in /tomcat/sandbox/gdev6x: build.properties.default java/org/apache/catalina/core/StandardServer.java
Date Wed, 17 Oct 2007 17:54:16 GMT
Author: fhanik
Date: Wed Oct 17 10:54:15 2007
New Revision: 585606

URL: http://svn.apache.org/viewvc?rev=585606&view=rev
Log:
Forward port from  6.0

Modified:
    tomcat/sandbox/gdev6x/build.properties.default
    tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardServer.java

Modified: tomcat/sandbox/gdev6x/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/sandbox/gdev6x/build.properties.default?rev=585606&r1=585605&r2=585606&view=diff
==============================================================================
--- tomcat/sandbox/gdev6x/build.properties.default (original)
+++ tomcat/sandbox/gdev6x/build.properties.default Wed Oct 17 10:54:15 2007
@@ -42,7 +42,7 @@
 jdt.home=${base.path}/eclipse/plugins
 jdt.lib=${jdt.home}
 jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.3.v_686_R32x.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip
+jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
 
 # ----- Tomcat native library -----
 tomcat-native.home=${base.path}/tomcat-native-1.1.10

Modified: tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardServer.java?rev=585606&r1=585605&r2=585606&view=diff
==============================================================================
--- tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/sandbox/gdev6x/java/org/apache/catalina/core/StandardServer.java Wed Oct 17 10:54:15
2007
@@ -360,7 +360,7 @@
         if( port==-1 ) {
             while( true ) {
                 try {
-                    Thread.sleep( 100000 );
+                    Thread.sleep( 10000 );
                 } catch( InterruptedException ex ) {
                 }
                 if( stopAwait ) return;
@@ -746,6 +746,9 @@
 
         // Notify our interested LifecycleListeners
         lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
+
+        if (port == -1)
+            stopAwait();
 
     }
 



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


Mime
View raw message