Updated Branches: refs/heads/apache-blur-0.2 293023adc -> 4e5813433
Better error handling in fetch during search. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/32e8ab73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/32e8ab73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/32e8ab73 Branch: refs/heads/apache-blur-0.2 Commit: 32e8ab73b83b42750e7a9dd04e9c36254ddd0a8a Parents: 293023a Author: Aaron McCurry <[email protected]> Authored: Wed Jan 8 14:27:22 2014 -0500 Committer: Aaron McCurry <[email protected]> Committed: Wed Jan 8 14:27:22 2014 -0500 ---------------------------------------------------------------------- .../org/apache/blur/thrift/BlurControllerServer.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/32e8ab73/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java index 0cd4e18..67a838b 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java @@ -533,7 +533,16 @@ public class BlurControllerServer extends TableAdmin implements Iface { // Wait for all parallel calls to finish. for (Future<Boolean> future : futures) { - future.get(); + try { + future.get(); + } catch (ExecutionException e) { + Throwable throwable = e.getCause(); + if (throwable instanceof BlurException) { + throw (BlurException) throwable; + } else { + throw new BException("Unknown error during fetch", throwable); + } + } } // Place fetch results into result object for response.
