From 23e7c5971390351e43cddc149f3ceef0924581d2 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Fri, 15 Feb 2019 08:44:31 +0100
Subject: [PATCH] Fix NPE on Stale Index in IndicesService (#38891)

* Closes #38845
---
 .../main/java/org/elasticsearch/indices/IndicesService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java
index d20f736019eb1..717eb641ecbbf 100644
--- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java
+++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java
@@ -882,6 +882,9 @@ public IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState
             final IndexMetaData metaData;
             try {
                 metaData = metaStateService.loadIndexState(index);
+                if (metaData == null) {
+                    return null;
+                }
             } catch (Exception e) {
                 logger.warn(() -> new ParameterizedMessage("[{}] failed to load state file from a stale deleted index, " +
                     "folders will be left on disk", index), e);