Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 98866 invoked from network); 30 Dec 2005 18:12:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Dec 2005 18:12:54 -0000 Received: (qmail 1736 invoked by uid 500); 30 Dec 2005 18:12:46 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 1714 invoked by uid 500); 30 Dec 2005 18:12:46 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 1705 invoked by uid 99); 30 Dec 2005 18:12:46 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Dec 2005 10:12:46 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 30 Dec 2005 10:12:45 -0800 Received: (qmail 98219 invoked by uid 65534); 30 Dec 2005 18:11:46 -0000 Message-ID: <20051230181146.98193.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r360127 - in /incubator/activemq/trunk/activemq-core/src: main/java/org/apache/activemq/ test/java/org/apache/activemq/broker/policy/ Date: Fri, 30 Dec 2005 18:10:46 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Fri Dec 30 10:09:24 2005 New Revision: 360127 URL: http://svn.apache.org/viewcvs?rev=360127&view=rev Log: Fixed https://jira.logicblaze.com/jira/browse/AMQ-460 Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=360127&r1=360126&r2=360127&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Fri Dec 30 10:09:24 2005 @@ -649,10 +649,11 @@ MessageAck ack = new MessageAck(lastMd, MessageAck.POSION_ACK_TYPE, deliveredMessages.size()); session.asyncSendPacket(ack); - // Adjust the counters - deliveredCounter -= deliveredMessages.size(); + // Adjust the window size. additionalWindowSize = Math.max(0, additionalWindowSize - deliveredMessages.size()); - + rollbackCounter = 0; + redeliveryDelay = 0; + } else { // stop the delivery of messages. @@ -684,6 +685,7 @@ } } + deliveredCounter -= deliveredMessages.size(); deliveredMessages.clear(); } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java?rev=360127&r1=360126&r2=360127&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java Fri Dec 30 10:09:24 2005 @@ -161,5 +161,7 @@ } } - + public String toString() { + return list.toString(); + } } Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java?rev=360127&r1=360126&r2=360127&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java Fri Dec 30 10:09:24 2005 @@ -36,7 +36,7 @@ public abstract class DeadLetterTestSupport extends TestSupport { protected int messageCount = 10; - protected long timeToLive = 250; + protected long timeToLive = 0; protected Connection connection; protected Session session; protected MessageConsumer consumer;