diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java index 53e08acbab..16ac8596c3 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java @@ -31,9 +31,6 @@ import javax.jms.*; import junit.framework.TestCase; -/** - * This is a slow test. - */ public class MultipleConnectionTest extends TestCase { public static final String _defaultBroker = "vm://:1"; @@ -118,13 +115,15 @@ public class MultipleConnectionTest extends TestCase synchronized boolean waitUntil(int expected, long maxWait) throws InterruptedException { long start = System.currentTimeMillis(); - long timeLeft = maxWait; - do + while (expected > _count) { + long timeLeft = maxWait - timeSince(start); + if (timeLeft < 0) + { + break; + } wait(timeLeft); - timeLeft = maxWait - timeSince(start); } - while (expected > _count && timeLeft > 0); return expected <= _count; } |