ARTEMIS-385 small fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f0b8f1e3 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f0b8f1e3 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f0b8f1e3 Branch: refs/heads/refactor-openwire Commit: f0b8f1e356d0fb1d58da3f1fac47d2fa0f018987 Parents: de4e2cf Author: Clebert Suconic <[email protected]> Authored: Thu Feb 4 15:59:00 2016 -0500 Committer: Clebert Suconic <[email protected]> Committed: Thu Feb 4 15:59:50 2016 -0500 ---------------------------------------------------------------------- .../client/impl/ClientSessionFactoryImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f0b8f1e3/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java index 384bced..755d93b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java @@ -1337,15 +1337,20 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C Pair<TransportConfiguration, TransportConfiguration> connectorPair, boolean isLast) { - if (isLast) { - latchFinalTopology.countDown(); - } + try { + // if it is our connector then set the live id used for failover + if (connectorPair.getA() != null && TransportConfigurationUtil.isSameHost(connectorPair.getA(), connectorConfig)) { + liveNodeID = nodeID; + } - // if it is our connector then set the live id used for failover - if (connectorPair.getA() != null && TransportConfigurationUtil.isSameHost(connectorPair.getA(), connectorConfig)) { - liveNodeID = nodeID; + serverLocator.notifyNodeUp(uniqueEventID, nodeID, backupGroupName, scaleDownGroupName, connectorPair, isLast); } - serverLocator.notifyNodeUp(uniqueEventID, nodeID, backupGroupName, scaleDownGroupName, connectorPair, isLast); + finally { + if (isLast) { + latchFinalTopology.countDown(); + } + } + } @Override
