diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 00:53:34 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-02-21 00:53:34 +0000 |
| commit | b2c03878add4cec8dc3280eac4b2c56545038bb8 (patch) | |
| tree | 60dac437bbaecd40739a6512a77a156190057847 /qpid/java/broker | |
| parent | db1de2e62e53a8967c75829accdbfc127d0f3acf (diff) | |
| download | qpid-python-b2c03878add4cec8dc3280eac4b2c56545038bb8.tar.gz | |
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
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java | 5 |
1 files changed, 4 insertions, 1 deletions
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) |