[activemq] branch master updated: no-jira - fix intermittent test failure where assertion fell on old bridge

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[activemq] branch master updated: no-jira - fix intermittent test failure where assertion fell on old bridge

gtully-2
This is an automated email from the ASF dual-hosted git repository.

gtully pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new a0dace7  no-jira - fix intermittent test failure where assertion fell on old bridge
a0dace7 is described below

commit a0dace794a9d0f818a58d3d6eaf61b491e0a6296
Author: gtully <[hidden email]>
AuthorDate: Mon Dec 2 10:47:49 2019 +0000

    no-jira - fix intermittent test failure where assertion fell on old bridge
---
 .../java/org/apache/activemq/network/NetworkReconnectSslNioTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ public class NetworkReconnectSslNioTest {
                     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) {}