Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1029 Fixing Scaledown tests

This commit is contained in:
Clebert Suconic 2017-03-09 21:42:54 -05:00
parent 5534d00fab
commit 761f42277d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
View File

@ -109,9 +109,15 @@ public class ClusterController implements ActiveMQComponent {
//latch so we know once we are connected
replicationClusterConnectedLatch = new CountDownLatch(1);
//and add the quorum manager as a topology listener
defaultLocator.addClusterTopologyListener(quorumManager);
//start the quorum manager
quorumManager.start();
if (defaultLocator != null) {
defaultLocator.addClusterTopologyListener(quorumManager);
}
if (quorumManager != null) {
//start the quorum manager
quorumManager.start();
}
started = true;
//connect all the locators in a separate thread
for (ServerLocatorInternal serverLocatorInternal : locators.values()) {

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
View File

@ -247,9 +247,7 @@ public final class ClusterManager implements ActiveMQComponent {
/*
* only start if we are actually in a cluster
* */
if (clusterConnections.size() > 0) {
clusterController.start();
}
clusterController.start();
}
@Override