From 8b37827ac636b53e55f04c505d06e202e4535768 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Tue, 2 Feb 2016 18:14:37 -0500
Subject: [PATCH] Guard against null routing node iterator

---
 .../indices/cluster/IndicesClusterStateService.java         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
index bd94fb8a123..98bbd5fe000 100644
--- a/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
+++ b/core/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
@@ -415,6 +415,12 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
 
         RoutingTable routingTable = event.state().routingTable();
         RoutingNodes.RoutingNodeIterator routingNode = event.state().getRoutingNodes().routingNodeIter(event.state().nodes().localNodeId());
+
+        if (routingNode == null) {
+            failedShards.clear();
+            return;
+        }
+
         DiscoveryNodes nodes = event.state().nodes();
 
         for (final ShardRouting shardRouting : routingNode) {