From a2f94f2e2f7ac7d650b5ce39ae408db611518e2f Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Tue, 8 Sep 2015 10:57:11 +0200 Subject: [PATCH] move ZenDiscovery.rejoin to protected So we can override it from tests and plugins. --- .../main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index 578f574744f..6b52531c18c 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -989,7 +989,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implemen } } - private ClusterState rejoin(ClusterState clusterState, String reason) { + protected ClusterState rejoin(ClusterState clusterState, String reason) { // *** called from within an cluster state update task *** // assert Thread.currentThread().getName().contains(InternalClusterService.UPDATE_THREAD_NAME);