From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 2 Feb 2011 03:45:05 +0000 (+0000)
Subject: Followup to r1066310.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5f324bac87a5f586eadd7b16096ac166cc4f6797;p=tomcat7.0

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 f08a731a5..d77b9e37c 100644
--- 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();
 
     }