[prev in list] [next in list] [prev in thread] [next in thread]
List: activemq-commits
Subject: svn commit: r360127 - in /incubator/activemq/trunk/activemq-core/src:
From: chirino () apache ! org
Date: 2005-12-30 18:10:46
Message-ID: 20051230181146.98193.qmail () minotaur ! apache ! org
[Download RAW message or body]
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/jav \
a/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/jav \
a/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/jav \
a/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;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic