From b2c03878add4cec8dc3280eac4b2c56545038bb8 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Tue, 21 Feb 2012 00:53:34 +0000 Subject: QPID-3477 : Java Broker does not handle a rejection/acknowledgemnt with invalid code correctly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291539 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/server/subscription/Subscription_0_10.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java index 3a0a0e76ad..a75467ac42 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java @@ -688,7 +688,10 @@ public class Subscription_0_10 implements Subscription, FlowCreditManager.FlowCr { entry.setRedelivered(); entry.routeToAlternate(); - + if(entry.isAcquiredBy(this)) + { + entry.discard(); + } } void release(final QueueEntry entry, final boolean setRedelivered) -- cgit v1.2.1