From 9dfc81a98121ac26304790dd474a9bb4e3962496 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Tue, 20 Jan 2015 16:47:50 +0000
Subject: QPID-6294 : Fix issue whereby AUTO ACK receive consumer would only
 ever receive one message since _currentPrefetch would never be zeroed

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1653293 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'qpid/java/client/src')

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
index 3cc50512ed..1d7bb6087a 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
@@ -22,6 +22,7 @@ package org.apache.qpid.client;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
+import javax.jms.Session;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -182,7 +183,8 @@ public class BasicMessageConsumer_0_8 extends BasicMessageConsumer<UnprocessedMe
             {
                 getSession().reduceCreditAfterAcknowledge();
             }
-            if (manageCredit && message != null)
+            if (manageCredit && !(getSession().getAcknowledgeMode() == Session.AUTO_ACKNOWLEDGE
+                                  || getSession().getAcknowledgeMode() == Session.DUPS_OK_ACKNOWLEDGE) && message != null)
             {
                 getSession().updateCurrentPrefetch(1);
             }
@@ -214,7 +216,8 @@ public class BasicMessageConsumer_0_8 extends BasicMessageConsumer<UnprocessedMe
             {
                 getSession().reduceCreditAfterAcknowledge();
             }
-            if (manageCredit && message != null)
+            if (manageCredit && !(getSession().getAcknowledgeMode() == Session.AUTO_ACKNOWLEDGE
+                                  || getSession().getAcknowledgeMode() == Session.DUPS_OK_ACKNOWLEDGE) && message != null)
             {
                 getSession().updateCurrentPrefetch(1);
             }
-- 
cgit v1.2.1