From commits-return-4856-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Fri Feb 23 20:26:04 2007 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 22493 invoked from network); 23 Feb 2007 20:26:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Feb 2007 20:26:04 -0000 Received: (qmail 10318 invoked by uid 500); 23 Feb 2007 20:26:12 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 10293 invoked by uid 500); 23 Feb 2007 20:26:12 -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 10284 invoked by uid 99); 23 Feb 2007 20:26:12 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Feb 2007 12:26:12 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Fri, 23 Feb 2007 12:26:03 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 74D501A981A; Fri, 23 Feb 2007 12:25:43 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r511090 - in /activemq/branches/activemq-4.1: ./ activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Date: Fri, 23 Feb 2007 20:25:43 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070223202543.74D501A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Fri Feb 23 12:25:42 2007 New Revision: 511090 URL: http://svn.apache.org/viewvc?view=rev&rev=511090 Log: r246@34: chirino | 2007-02-23 14:49:53 -0500 Avoid hanging connection if dispatch fails when shutdowninfo is sent Modified: activemq/branches/activemq-4.1/ (props changed) activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Propchange: activemq/branches/activemq-4.1/ ------------------------------------------------------------------------------ --- svk:merge (original) +++ svk:merge Fri Feb 23 12:25:42 2007 @@ -1 +1 @@ -635f1f41-eb29-0410-ac9d-be9e2c357fdd:/local/amq-4.1-port:245 +635f1f41-eb29-0410-ac9d-be9e2c357fdd:/local/amq-4.1-port:246 Modified: activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?view=diff&rev=511090&r1=511089&r2=511090 ============================================================================== --- activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original) +++ activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Fri Feb 23 12:25:42 2007 @@ -583,8 +583,6 @@ public void dispose() throws JMSException { if (!unconsumedMessages.isClosed()) { - //log.warn("Consumer is being disposed.", new Exception("trace exception.")); - // Do we have any acks we need to send out before closing? // Ack any delivered messages now. (session may still // commit/rollback the acks). Modified: activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?view=diff&rev=511090&r1=511089&r2=511090 ============================================================================== --- activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (original) +++ activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Fri Feb 23 12:25:42 2007 @@ -826,7 +826,10 @@ if( disposed.get() ) { if( dispatchStopped.compareAndSet(false, true)) { if( transportException.get()==null ) { - dispatch(new ShutdownInfo()); + try { + dispatch(new ShutdownInfo()); + } catch (Throwable ignore) { + } } dispatchStoppedLatch.countDown(); } @@ -930,11 +933,12 @@ } - taskRunner.wakeup(); - dispatchStoppedLatch.await(); - if( taskRunner!=null ) + if( taskRunner!=null ) { + taskRunner.wakeup(); + dispatchStoppedLatch.await(); taskRunner.shutdown(); + } // Run the MessageDispatch callbacks so that message references get cleaned up. for (Iterator iter = dispatchQueue.iterator(); iter.hasNext();) {