From 33d8571d1e7dc01fc287dec1ffb7f428b5116eb0 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Tue, 30 Jul 2013 16:44:30 +0200
Subject: [PATCH] make sure we wrap a potential failure in sending master state
 change in a catch

---
 .../indices/cluster/IndicesClusterStateService.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
index 82654cdf389..6614e029a81 100644
--- a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
+++ b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
@@ -178,14 +178,14 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
             try {
                 nodeIndexCreatedAction.nodeIndexCreated(index, event.state().nodes().localNodeId());
             } catch (Exception e) {
-                logger.debug("failed to send to master index {} created event", index);
+                logger.debug("failed to send to master index {} created event", e, index);
             }
         }
         for (String index : event.indicesDeleted()) {
             try {
                 nodeIndexDeletedAction.nodeIndexDeleted(index, event.state().nodes().localNodeId());
             } catch (Exception e) {
-                logger.debug("failed to send to master index {} deleted event", index);
+                logger.debug("failed to send to master index {} deleted event", e, index);
             }
         }
     }
@@ -193,7 +193,11 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
     private void notifyIndicesStateChanged(final ClusterChangedEvent event) {
         //handles open/close index notifications
         if (event.indicesStateChanged()) {
-            nodeIndicesStateUpdatedAction.nodeIndexStateUpdated(new NodeIndicesStateUpdatedAction.NodeIndexStateUpdatedResponse(event.state().nodes().localNodeId(), event.state().version()));
+            try {
+                nodeIndicesStateUpdatedAction.nodeIndexStateUpdated(new NodeIndicesStateUpdatedAction.NodeIndexStateUpdatedResponse(event.state().nodes().localNodeId(), event.state().version()));
+            } catch (Exception e) {
+                logger.debug("failed to send to master indices state change event", e);
+            }
         }
     }