From bbe619a416cd4d4cb10654b487f0f41371c1fd1c Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Wed, 3 Apr 2013 12:25:27 +0200
Subject: [PATCH] Call onFailure for every exception case even in the case of
 an error / runtime exception

Closes #2848
---
 .../action/SearchServiceTransportAction.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java b/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java
index f3720ec5413..ecdd0be90a8 100644
--- a/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java
+++ b/src/main/java/org/elasticsearch/search/action/SearchServiceTransportAction.java
@@ -106,7 +106,7 @@ public class SearchServiceTransportAction extends AbstractComponent {
             try {
                 DfsSearchResult result = searchService.executeDfsPhase(request);
                 listener.onResult(result);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 listener.onFailure(e);
             }
         } else {
@@ -174,7 +174,7 @@ public class SearchServiceTransportAction extends AbstractComponent {
             try {
                 QuerySearchResult result = searchService.executeQueryPhase(request);
                 listener.onResult(result);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 listener.onFailure(e);
             }
         } else {
@@ -208,7 +208,7 @@ public class SearchServiceTransportAction extends AbstractComponent {
             try {
                 ScrollQuerySearchResult result = searchService.executeQueryPhase(request);
                 listener.onResult(result.queryResult());
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 listener.onFailure(e);
             }
         } else {
@@ -242,7 +242,7 @@ public class SearchServiceTransportAction extends AbstractComponent {
             try {
                 QueryFetchSearchResult result = searchService.executeFetchPhase(request);
                 listener.onResult(result);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 listener.onFailure(e);
             }
         } else {
@@ -276,7 +276,7 @@ public class SearchServiceTransportAction extends AbstractComponent {
             try {
                 QueryFetchSearchResult result = searchService.executeFetchPhase(request);
                 listener.onResult(result);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 listener.onFailure(e);
             }
         } else {
@@ -310,7 +310,7 @@ public class SearchServiceTransportAction extends AbstractComponent {
             try {
                 ScrollQueryFetchSearchResult result = searchService.executeFetchPhase(request);
                 listener.onResult(result.result());
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 listener.onFailure(e);
             }
         } else {
@@ -412,7 +412,7 @@ public class SearchServiceTransportAction extends AbstractComponent {
             try {
                 ScrollQueryFetchSearchResult result = searchService.executeScan(request);
                 listener.onResult(result.result());
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 listener.onFailure(e);
             }
         } else {