commit a0dace794a9d0f818a58d3d6eaf61b491e0a6296
author gtully <gary.tully@gmail.com> Mon Dec 02 10:47:49 2019 +0000
committer gtully <gary.tully@gmail.com> Mon Dec 02 10:47:49 2019 +0000
tree 5629d55e1cfea53077bf930912a8982d2038b000
parent 5a0c853ba0e2ade0b29fa4319857bd8a557995e4

no-jira - fix intermittent test failure where assertion fell on old bridge

activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectSslNioTest.java

diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectSslNioTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectSslNioTest.java
index 95309a3..d72c0e2 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectSslNioTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkReconnectSslNioTest.java
@@ -87,7 +87,7 @@
                     if (!networkConnector.activeBridges().isEmpty()) {
                         try {
                             DurableConduitBridge durableConduitBridge = (DurableConduitBridge) networkConnector.activeBridges().iterator().next();
-                            if ("R".equals(durableConduitBridge.getRemoteBrokerName())) {
+                            if ("R".equals(durableConduitBridge.getRemoteBrokerName()) && durableConduitBridge.bridgeFailed.get() == false) {
                                 bridge.set(durableConduitBridge);
                             }
                         } catch (NoSuchElementException expectedContention) {}