From 97b5c100ce245168b01b0f126fc6c7cff54d8be7 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Thu, 12 Jan 2012 14:31:37 +0200
Subject: [PATCH] Add a simplified setting to disable shutdown API:
 action.disable_shutdown, closes #1606.

---
 .../cluster/node/shutdown/TransportNodesShutdownAction.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java
index bc8debcf44d..148766484b2 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportNodesShutdownAction.java
@@ -62,7 +62,7 @@ public class TransportNodesShutdownAction extends TransportMasterNodeOperationAc
         super(settings, transportService, clusterService, threadPool);
         this.node = node;
         this.clusterName = clusterName;
-        this.disabled = componentSettings.getAsBoolean("disabled", false);
+        this.disabled = settings.getAsBoolean("action.disable_shutdown", componentSettings.getAsBoolean("disabled", false));
         this.delay = componentSettings.getAsTime("delay", TimeValue.timeValueMillis(200));
 
         this.transportService.registerHandler(NodeShutdownRequestHandler.ACTION, new NodeShutdownRequestHandler());