summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2006-12-20 17:04:33 +0000
committerMartin Ritchie <ritchiem@apache.org>2006-12-20 17:04:33 +0000
commit8d15851f88be03e89a3901a8ac7fdcce3c6396f0 (patch)
tree37730a87d0a343efd9b49b0b63a3bb92972c8265
parent783011e50bf81518ddc735ab8253b395b0a4de41 (diff)
downloadqpid-python-8d15851f88be03e89a3901a8ac7fdcce3c6396f0.tar.gz
QPID-225
Applied Patch for queue browsing with client acknowledgement git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@489140 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index 673321cd9d..cefaca8d52 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
@@ -554,6 +554,12 @@ public class BasicMessageConsumer extends Closeable implements MessageConsumer
msg.setJMSDestination(_destination);
switch (_acknowledgeMode)
{
+ case Session.CLIENT_ACKNOWLEDGE:
+ if (isNoConsume())
+ {
+ _session.acknowledgeMessage(msg.getDeliveryTag(), false);
+ }
+ break;
case Session.DUPS_OK_ACKNOWLEDGE:
if (++_outstanding >= _prefetchHigh)
{
@@ -580,7 +586,14 @@ public class BasicMessageConsumer extends Closeable implements MessageConsumer
}
break;
case Session.SESSION_TRANSACTED:
- _lastDeliveryTag = msg.getDeliveryTag();
+ if (isNoConsume())
+ {
+ _session.acknowledgeMessage(msg.getDeliveryTag(), false);
+ }
+ else
+ {
+ _lastDeliveryTag = msg.getDeliveryTag();
+ }
break;
}
}