From eea3a01765286c0ef7f9b5c438dceed7be253c18 Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Fri, 22 Feb 2013 23:08:00 +0100 Subject: [PATCH] only return 404 on actual index settings missing, on "_all", return 200 relates to #2676 --- .../action/admin/indices/settings/RestGetSettingsAction.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java index 09140f2f7fb..850373d5da4 100644 --- a/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java +++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java @@ -72,9 +72,8 @@ public class RestGetSettingsAction extends BaseRestHandler { try { MetaData metaData = response.getState().metaData(); - if (metaData.indices().isEmpty()) { - String indexName = indices.length == 0 ? "_all" : indices[0]; - channel.sendResponse(new XContentThrowableRestResponse(request, new IndexMissingException(new Index(indexName)))); + if (metaData.indices().isEmpty() && indices.length > 0) { + channel.sendResponse(new XContentThrowableRestResponse(request, new IndexMissingException(new Index(indices[0])))); return; }