Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 7015 invoked from network); 2 Feb 2011 03:45:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Feb 2011 03:45:30 -0000 Received: (qmail 51707 invoked by uid 500); 2 Feb 2011 03:45:29 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 51340 invoked by uid 500); 2 Feb 2011 03:45:27 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 51305 invoked by uid 99); 2 Feb 2011 03:45:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 03:45:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Feb 2011 03:45:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6388F23889E9; Wed, 2 Feb 2011 03:45:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066321 - /tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Date: Wed, 02 Feb 2011 03:45:05 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110202034505.6388F23889E9@eris.apache.org> 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