Repository: activemq Updated Branches: refs/heads/trunk 1e5d21276 -> bae0e60a7
fix intermittent failure Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/bae0e60a Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/bae0e60a Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/bae0e60a Branch: refs/heads/trunk Commit: bae0e60a7c2361d57164dd77269f769f511e1a27 Parents: 1e5d212 Author: gtully <[email protected]> Authored: Tue Jan 27 15:50:56 2015 +0000 Committer: gtully <[email protected]> Committed: Tue Jan 27 15:50:56 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/activemq/transport/stomp/ConnectTest.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/bae0e60a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java ---------------------------------------------------------------------- diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java index e95fd92..7154996 100644 --- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java +++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java @@ -22,6 +22,8 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.ServerSocket; import java.util.Vector; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.net.ServerSocketFactory; @@ -93,6 +95,7 @@ public class ConnectTest { brokerService.addConnector("stomp://0.0.0.0:0?transport.closeAsync=false"); brokerService.start(); + final CountDownLatch doneConnect = new CountDownLatch(1); final int listenPort = brokerService.getTransportConnectors().get(0).getConnectUri().getPort(); Thread t1 = new Thread() { StompConnection connection = new StompConnection(); @@ -102,6 +105,7 @@ public class ConnectTest { try { connection.open("localhost", listenPort); connection.connect("system", "manager"); + doneConnect.countDown(); } catch (Exception ex) { LOG.error("unexpected exception on connect/disconnect", ex); exceptions.add(ex); @@ -118,6 +122,7 @@ public class ConnectTest { } })); + assertTrue("connected on time", doneConnect.await(5, TimeUnit.SECONDS)); brokerService.stop(); // server socket should be available after stop
