incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [01/28] git commit: Better error handling in fetch during search.
Date Wed, 15 Jan 2014 22:03:24 GMT
Updated Branches:
  refs/heads/master 858149480 -> 5f8896865


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/937dc012
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/937dc012
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/937dc012

Branch: refs/heads/master
Commit: 937dc01259fa63555153df46ffce60c5ad622ebc
Parents: 8581494
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Jan 8 14:27:22 2014 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Jan 15 17:01:47 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/937dc012/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.


Mime
View raw message