Author: rgodfrey
Date: Tue Feb 21 00:53:34 2012
New Revision: 1291539
URL: http://svn.apache.org/viewvc?rev=1291539&view=rev
Log:
QPID-3477 : Java Broker does not handle a rejection/acknowledgemnt with invalid
code correctly
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=1291539&r1=1291538&r2=1291539&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
Tue Feb 21 00:53:34 2012
@@ -688,7 +688,10 @@ public class Subscription_0_10 implement
{
entry.setRedelivered();
entry.routeToAlternate();
-
+ if(entry.isAcquiredBy(this))
+ {
+ entry.discard();
+ }
}
void release(final QueueEntry entry, final boolean setRedelivered)
Modified: qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes?rev=1291539&r1=1291538&r2=1291539&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes
(original)
+++ qpid/trunk/qpid/java/test-profiles/python_tests/Java010PythonExcludes Tue
Feb 21 00:53:34 2012
@@ -64,9 +64,6 @@ qpid_tests.broker_0_10.message.MessageTe
#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
Modified: qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py?rev=1291539&r1=1291538&r2=1291539&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py (original)
+++ qpid/trunk/qpid/python/qpid/tests/messaging/endpoints.py Tue Feb 21
00:53:34 2012
@@ -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()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
