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 | |
| 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
3 files changed, 5 insertions, 5 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) diff --git a/qpid/java/test-profiles/python_tests/Java010PythonExcludes b/qpid/java/test-profiles/python_tests/Java010PythonExcludes index 488201eb6c..b61ac73183 100644 --- a/qpid/java/test-profiles/python_tests/Java010PythonExcludes +++ b/qpid/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 diff --git a/qpid/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py index c3702bf5be..62deacd0bd 100644 --- a/qpid/python/qpid/tests/messaging/endpoints.py +++ b/qpid/python/qpid/tests/messaging/endpoints.py @@ -524,7 +524,7 @@ class SessionTests(Base): self.ssn.acknowledge(echos[0]) self.ssn.acknowledge(echos[1], Disposition(REJECTED)) self.ssn.acknowledge(echos[2], - Disposition(REJECTED, code=3, text="test-reject")) + Disposition(REJECTED, code=0, text="test-reject")) self.drain(rej, expected=msgs[1:]) self.ssn.acknowledge() |