NO-JIRA: [Java Broker Tests] Fix for occasionally failing ConnectionManagementTest on 0-10 path

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

1 files changed, 10 insertions, 0 deletions

diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
index 34b13dfaca..67af3e17e4 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
@@ -82,6 +82,16 @@ public class ConnectionManagementTest extends QpidBrokerTestCase
         assertEquals("Expected one managed connection", 1, getManagedConnections().size());
 
         _connection.close();
+
+        // On the 0-10 path, the connection close ok is sent *before* the model is updated, so we need poll
+        // to reliable detect the state change.
+        int counter = 0;
+        while(getManagedConnections().size() > 0 && counter < 50)
+        {
+            sleep();
+            counter++;
+        }
+
         assertEquals("Expected no managed connections after client connection closed", 0, getManagedConnections().size());
     }