diff options
| author | Keith Wall <kwall@apache.org> | 2012-03-01 08:50:38 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-03-01 08:50:38 +0000 |
| commit | 8a3a0e04c20a7e338f9f55cf892453fe97f32b90 (patch) | |
| tree | 1c9b0bcc7544af79187d0ed4578aba276cfbfd94 | |
| parent | 881ee54a911025bde416bf51efa1cbf33a376794 (diff) | |
| download | qpid-python-8a3a0e04c20a7e338f9f55cf892453fe97f32b90.tar.gz | |
QPID-3599: Python session tests fail against the Java Broker due to unexpected redelivered status
Changed Java Broker so once a message is acknowledged, if the session is transactional and the
transaction is rolled-back, the queue entry is marked as redelivered. The rationale is that if the
client has acknowledged, then it is certain they have seen it/them.
The python tests testCommitAck and testRollback highlighted this defect as they acknowledge the session
before rollback (something that is impossible to control from the JMS API).
Python tests reenabled against the Java Broker:
qpid.tests.messaging.endpoints.SessionTests.testCommitAck
qpid.tests.messaging.endpoints.SessionTests.testRelease
qpid.tests.messaging.endpoints.SessionTests.testRollback
Work of Robbie Gemmell <robbie@apache.org> and myself.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1295474 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java | 3 | ||||
| -rw-r--r-- | java/test-profiles/python_tests/Java010PythonExcludes | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java index c51b17c447..9f7b8c53b8 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java +++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java @@ -403,6 +403,9 @@ public class ServerSession extends Session public void onRollback() { + // The client has acknowledge the message and therefore have seen it. + // In the event of rollback, the message must be marked as redelivered. + entry.setRedelivered(); entry.release(); } }); diff --git a/java/test-profiles/python_tests/Java010PythonExcludes b/java/test-profiles/python_tests/Java010PythonExcludes index fd40ebd858..13f9d5484e 100644 --- a/java/test-profiles/python_tests/Java010PythonExcludes +++ b/java/test-profiles/python_tests/Java010PythonExcludes @@ -67,7 +67,3 @@ qpid_tests.broker_0_10.message.MessageTests.test_window_flow_bytes #QPID-3605 Durable subscriber with no-local true receives messages on re-connection qpid_tests.broker_0_10.message.MessageTests.test_no_local_awkward -#QPID-3599 Tests fail due to differences in expected message Redelivered status -qpid.tests.messaging.endpoints.SessionTests.testCommitAck -qpid.tests.messaging.endpoints.SessionTests.testRelease -qpid.tests.messaging.endpoints.SessionTests.testRollback |