QPID-1816 : Fixed wait for messages loop so on error the test does not get stuck

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@822170 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 0 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
index 73308d41c0..4254727d36 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
@@ -77,6 +77,9 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message
             {
                 break;
             }
+            // Remember the currentCount as the lastCount for the next cycle.
+            // so we can exit if things get locked up.
+            lastCount = currentCount;
 
             complete = _receviedAll.await(5000L, TimeUnit.MILLISECONDS);
         }