Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 85293 invoked from network); 31 Mar 2008 23:16:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Mar 2008 23:16:17 -0000 Received: (qmail 92625 invoked by uid 500); 31 Mar 2008 23:16:15 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 92597 invoked by uid 500); 31 Mar 2008 23:16:15 -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 92588 invoked by uid 99); 31 Mar 2008 23:16:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Mar 2008 16:16:15 -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; Mon, 31 Mar 2008 23:15:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 529A91A9832; Mon, 31 Mar 2008 16:15:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643205 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java Date: Mon, 31 Mar 2008 23:15:51 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080331231552.529A91A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Mon Mar 31 16:15:45 2008 New Revision: 643205 URL: http://svn.apache.org/viewvc?rev=643205&view=rev Log: do best effort to drain the queues.. and error should not interrupt the connection and broker shutdown. Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java?rev=643205&r1=643204&r2=643205&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/amq1095/ActiveMQTestCase.java Mon Mar 31 16:15:45 2008 @@ -142,14 +142,17 @@ */ protected void tearDown() throws Exception { TextMessage msg; - for (final Iterator i = consumersToEmpty.iterator(); i.hasNext();) - { - final MessageConsumer consumer = (MessageConsumer) i.next(); - if (consumer != null) - do - msg = (TextMessage) consumer.receive(RECEIVE_TIMEOUT); - while (msg != null); - } + try { + for (final Iterator i = consumersToEmpty.iterator(); i.hasNext();) + { + final MessageConsumer consumer = (MessageConsumer) i.next(); + if (consumer != null) + do + msg = (TextMessage) consumer.receive(RECEIVE_TIMEOUT); + while (msg != null); + } + } catch (Exception e) { + } if (connection != null) { connection.stop(); }