Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 17427 invoked from network); 31 May 2010 16:12:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 31 May 2010 16:12:28 -0000 Received: (qmail 8169 invoked by uid 500); 31 May 2010 16:12:28 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 8116 invoked by uid 500); 31 May 2010 16:12:28 -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 8109 invoked by uid 99); 31 May 2010 16:12:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 May 2010 16:12:28 +0000 X-ASF-Spam-Status: No, hits=-1394.7 required=10.0 tests=ALL_TRUSTED,AWL 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; Mon, 31 May 2010 16:12:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 385DD23889B6; Mon, 31 May 2010 16:12:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r949789 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Date: Mon, 31 May 2010 16:12:07 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100531161207.385DD23889B6@eris.apache.org> Author: gtully Date: Mon May 31 16:12:06 2010 New Revision: 949789 URL: http://svn.apache.org/viewvc?rev=949789&view=rev Log: resolve regression in FailoverTransactionTest following change to fix resolve https://issues.apache.org/activemq/browse/AMQ-2751, fix needs to be conditional on delayed delivery otherwise it can effect async transacted redelivery on failover Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=949789&r1=949788&r2=949789&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Mon May 31 16:12:06 2010 @@ -1232,7 +1232,10 @@ public class ActiveMQMessageConsumer imp } } } else { - session.connection.rollbackDuplicate(this, md.getMessage()); + if (!unconsumedMessages.isRunning()) { + // delayed redelivery, ensure it can be re delivered + session.connection.rollbackDuplicate(this, md.getMessage()); + } unconsumedMessages.enqueue(md); if (availableListener != null) { availableListener.onMessageAvailable(this);