tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1066321 - /tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
Date Wed, 02 Feb 2011 03:45:05 GMT
Author: kkolinko
Date: Wed Feb  2 03:45:05 2011
New Revision: 1066321

URL: http://svn.apache.org/viewvc?rev=1066321&view=rev
Log:
Followup to r1066310.
Simplify: call stopAwait() unconditionally.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardServer.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1066321&r1=1066320&r2=1066321&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Wed Feb  2 03:45:05 2011
@@ -407,6 +407,7 @@ public final class StandardServer extend
                     try {
                         Thread.sleep( 10000 );
                     } catch( InterruptedException ex ) {
+                        // continue and check the flag
                     }
                 }
             } finally {
@@ -744,8 +745,7 @@ public final class StandardServer extend
             services[i].stop();
         }
 
-        if (awaitThread != null)
-            stopAwait();
+        stopAwait();
 
     }
 



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


Mime
View raw message