From 267cd65506ab22ceb7606243ef58979bde5dbfe5 Mon Sep 17 00:00:00 2001
From: Jun Ohtani <johtani@gmail.com>
Date: Wed, 16 Dec 2015 00:01:31 +0900
Subject: [PATCH] Analysis : Fix no response from Analyze API without specified
 index

Fix error handling in TransportSingleShardAction without shardIt

Closes #15148
---
 .../single/shard/TransportSingleShardAction.java  |  2 +-
 .../indices/analyze/AnalyzeActionIT.java          | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java b/core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
index c14878a3fca..2a7e19bfade 100644
--- a/core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
+++ b/core/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
@@ -177,7 +177,7 @@ public abstract class TransportSingleShardAction<Request extends SingleShardRequ
 
                     @Override
                     public void handleException(TransportException exp) {
-                        perform(exp);
+                        listener.onFailure(exp);
                     }
                 });
             } else {
diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java b/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java
index 80993229bec..80d5a6080b6 100644
--- a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java
+++ b/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java
@@ -503,4 +503,19 @@ public class AnalyzeActionIT extends ESIntegTestCase {
 
     }
 
+    public void testNonExistTokenizer() {
+        try {
+            AnalyzeResponse analyzeResponse = client().admin().indices()
+                .prepareAnalyze("this is a test")
+                .setAnalyzer("not_exist_analyzer")
+                .get();
+            fail("shouldn't get here");
+        } catch (Throwable t) {
+            assertThat(t, instanceOf(IllegalArgumentException.class));
+            assertThat(t.getMessage(), startsWith("failed to find analyzer"));
+
+        }
+
+    }
+
 }