Fixed https://jira.logicblaze.com/jira/browse/AMQ-460

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@360127 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java

@@ -649,10 +649,11 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
                 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 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
                 }
             }
 
+            deliveredCounter -= deliveredMessages.size();
             deliveredMessages.clear();
         }
 

activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java

@@ -161,5 +161,7 @@ public class MessageDispatchChannel {
         }
     }
 
-
+    public String toString() {
+        return list.toString();
+    }
 }

activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java

@@ -36,7 +36,7 @@ import javax.jms.Topic;
 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;