Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 90878 invoked from network); 19 Mar 2008 15:52:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Mar 2008 15:52:58 -0000 Received: (qmail 76865 invoked by uid 500); 19 Mar 2008 15:52:56 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 76838 invoked by uid 500); 19 Mar 2008 15:52:56 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 76829 invoked by uid 99); 19 Mar 2008 15:52:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2008 08:52:56 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2008 15:52:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 48C261A983A; Wed, 19 Mar 2008 08:52:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r638891 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Date: Wed, 19 Mar 2008 15:52:36 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080319155237.48C261A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Wed Mar 19 08:52:36 2008 New Revision: 638891 URL: http://svn.apache.org/viewvc?rev=638891&view=rev Log: Don't timeout a stop since that can lead to a failover connection not being able to reconnect correctly. Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=638891&r1=638890&r2=638891&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Wed Mar 19 08:52:36 2008 @@ -876,8 +876,8 @@ } public void stop() throws Exception { stopAsync(); - if( !stopped.await(10, TimeUnit.SECONDS) ) { - LOG.info("Could not shutdown the connection to '" + transport.getRemoteAddress()+ "' in a timely manner."); + while( !stopped.await(5, TimeUnit.SECONDS) ) { + LOG.info("The connection to '" + transport.getRemoteAddress()+ "' is taking a long time to shutdown."); } }