diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-10-13 11:50:25 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-10-13 11:50:25 +0000 |
| commit | ade995ffaa85492b0ca22141d86316acdcc879e8 (patch) | |
| tree | 92def10ca3f32a99b0f8d6247d759a95a1b6cde6 /qpid/java/systests | |
| parent | 53d85ef31d5ebfeba7e157342334dbfcc94e21f2 (diff) | |
| download | qpid-python-ade995ffaa85492b0ca22141d86316acdcc879e8.tar.gz | |
QPID-3546: update the highestDeliveryTag marker during failover to prevent the stale value being used to set the rollback mark on the first rollback after failover.
This commit only fixes the 0-10 client path, as fixing this on the 0-8/9/9-1 path currently would cause undesirable interaction with the issue in QPID 3521.
Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1182793 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java index 13a9dd73b8..107c730a7e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java @@ -94,7 +94,7 @@ public class CancelTest extends QpidBrokerTestCase browser.close(); MessageConsumer consumer = _clientSession.createConsumer(_queue); - assertNotNull( consumer.receive() ); + assertNotNull( consumer.receive(2000l) ); consumer.close(); } } |