From f07cc9da6e3f138efe5c6d1b76968a9b8eee5bf0 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 1 Oct 2007 15:27:54 +0000 Subject: QPID-595 CommitRollbackTest Patch provided by Aidan Skinner to address intermittent test failure. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580992 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/test/unit/transacted/CommitRollbackTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java index 6db27d6be0..3d5a1096b4 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java @@ -407,7 +407,6 @@ public class CommitRollbackTest extends TestCase { _logger.info("Got 1 redelivered"); assertTrue("Message is not marked as redelivered", result.getJMSRedelivered()); - assertFalse("Already received message one", _gotone); _gotone = true; } @@ -418,15 +417,15 @@ public class CommitRollbackTest extends TestCase if (result.getJMSRedelivered()) { _logger.info("Got 2 redelivered, message was prefetched"); - assertFalse("Already received message redelivered two", _gottwoRedelivered); - _gottwoRedelivered = true; + } else { _logger.warn("Got 2, message prefetched wasn't cleared or messages was in transit when rollback occured"); assertFalse("Already received message two", _gottwo); - + assertFalse("Already received message redelivered two", _gottwoRedelivered); + _gottwo = true; } } -- cgit v1.2.1