Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AE9BED5B2 for ; Tue, 7 Aug 2012 22:51:13 +0000 (UTC) Received: (qmail 29380 invoked by uid 500); 7 Aug 2012 22:51:13 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 29353 invoked by uid 500); 7 Aug 2012 22:51:13 -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 29346 invoked by uid 99); 7 Aug 2012 22:51:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Aug 2012 22:51:13 +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; Tue, 07 Aug 2012 22:51:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 552E42388860 for ; Tue, 7 Aug 2012 22:50:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1370581 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java Date: Tue, 07 Aug 2012 22:50:27 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120807225027.552E42388860@eris.apache.org> Author: tabish Date: Tue Aug 7 22:50:26 2012 New Revision: 1370581 URL: http://svn.apache.org/viewvc?rev=1370581&view=rev Log: method buildBackups should bail out early in the transport is stopped. Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java?rev=1370581&r1=1370580&r2=1370581&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java Tue Aug 7 22:50:26 2012 @@ -1149,7 +1149,7 @@ public class FailoverTransport implement } backups.removeAll(disposedList); disposedList.clear(); - for (Iterator iter = backupList.iterator(); iter.hasNext() && backups.size() < backupPoolSize; ) { + for (Iterator iter = backupList.iterator(); !disposed && iter.hasNext() && backups.size() < backupPoolSize; ) { URI uri = iter.next(); if (connectedTransportURI != null && !connectedTransportURI.equals(uri)) { try {