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 | 93ac4058ef95f760969dc9046e70d11be8f0aa12 (patch) | |
| tree | 2e43b8ed2c18da9e870be14658366db3efb14fcc /java | |
| parent | 56ac5684ae8379de26dd38fc893fad51ec84e957 (diff) | |
| download | qpid-python-93ac4058ef95f760969dc9046e70d11be8f0aa12.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/qpid@1291539 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java | 5 | ||||
| -rw-r--r-- | java/test-profiles/python_tests/Java010PythonExcludes | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java index 3a0a0e76ad..a75467ac42 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java +++ b/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) diff --git a/java/test-profiles/python_tests/Java010PythonExcludes b/java/test-profiles/python_tests/Java010PythonExcludes index 488201eb6c..b61ac73183 100644 --- a/java/test-profiles/python_tests/Java010PythonExcludes +++ b/java/test-profiles/python_tests/Java010PythonExcludes @@ -64,9 +64,6 @@ qpid_tests.broker_0_10.message.MessageTests.test_no_local_awkward #QPID-3594 exclusive queues problem qpid_tests.broker_0_10.queue.QueueTests.test_declare_exclusive -#QPID-3477: Java broker does not handle rejection code specified in test -qpid.tests.messaging.endpoints.SessionTests.testReject - #QPID-3595 Alternate Exchanges support requires work to be spec compliant. qpid_tests.broker_0_10.alternate_exchange.AlternateExchangeTests.test_delete_while_used_by_queue qpid_tests.broker_0_10.alternate_exchange.AlternateExchangeTests.test_modify_existing_exchange_alternate |