Followup to r1066310.

Simplify: call stopAwait() unconditionally.

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

diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java
index f08a731..d77b9e3 100644 (file)
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -407,6 +407,7 @@ public final class StandardServer extends LifecycleMBeanBase implements Server {
                     try {
                         Thread.sleep( 10000 );
                     } catch( InterruptedException ex ) {
+                        // continue and check the flag
                     }
                 }
             } finally {
@@ -744,8 +745,7 @@ public final class StandardServer extends LifecycleMBeanBase implements Server {
             services[i].stop();
         }
 
-        if (awaitThread != null)
-            stopAwait();
+        stopAwait();
 
     }