incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [02/19] git commit: Formatting change.
Date Thu, 23 May 2013 19:39:41 GMT
Formatting change.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/30735c97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/30735c97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/30735c97

Branch: refs/heads/0.1.5
Commit: 30735c975358a3bdce35979c831984f0da941aec
Parents: 0e02da8
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu May 23 11:44:41 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu May 23 11:44:41 2013 -0400

----------------------------------------------------------------------
 .../manager/results/MergerBlurResultIterable.java  |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/30735c97/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
b/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
index f0d4479..5fa9f6d 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/results/MergerBlurResultIterable.java
@@ -26,7 +26,6 @@ import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.utils.BlurExecutorCompletionService;
 import org.apache.blur.utils.ForkJoin.Merger;
 
-
 public class MergerBlurResultIterable implements Merger<BlurResultIterable> {
 
   private static Log LOG = LogFactory.getLog(MergerBlurResultIterable.class);
@@ -50,13 +49,14 @@ public class MergerBlurResultIterable implements Merger<BlurResultIterable>
{
         BlurResultIterable blurResultIterable = service.getResultThrowException(future, _blurQuery);
         iterable.addBlurResultIterable(blurResultIterable);
         if (iterable.getTotalResults() >= _minimumNumberOfResults) {
-          service.cancelAll();// Called to stop execution of any other running
-                              // queries.
+          // Called to stop execution of any other running queries.
+          service.cancelAll();
           return iterable;
         }
       } else {
         LOG.info("Query timeout with max query time of [{2}] for query [{1}].", _maxQueryTime,
_blurQuery);
-        throw new BlurException("Query timeout with max query time of [" + _maxQueryTime
+ "] for query [" + _blurQuery + "].", null);
+        throw new BlurException("Query timeout with max query time of [" + _maxQueryTime
+ "] for query [" + _blurQuery
+            + "].", null);
       }
     }
     return iterable;


Mime
View raw message