don't send leave request when the master node is null

2011-01-03 12:01:33 +02:00 · 2011-01-03 12:01:33 +02:00 · ccdbbef276
parent 84fa13a5e0
commit ccdbbef276
1 changed files with 1 additions and 1 deletions
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java
@ -147,7 +147,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implemen
        nodesFD.stop();
        initialStateSent.set(false);
        if (sendLeaveRequest) {
-            if (!master) {
+            if (!master && latestDiscoNodes.masterNode() != null) {
                try {
                    membership.sendLeaveRequestBlocking(latestDiscoNodes.masterNode(), localNode, TimeValue.timeValueSeconds(1));
                } catch (Exception e) {