incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Fixing error found in unit test.
Date Tue, 04 Jun 2013 02:25:15 GMT
Updated Branches:
  refs/heads/0.1.5 9e31fcc64 -> edc8b94f7


Fixing error found in unit test.


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

Branch: refs/heads/0.1.5
Commit: edc8b94f728391a5a15c87a596e5657c566dbb1c
Parents: 9e31fcc
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Jun 3 22:24:43 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Jun 3 22:24:43 2013 -0400

----------------------------------------------------------------------
 .../java/org/apache/blur/manager/IndexManager.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/edc8b94f/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java b/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
index 2a08151..e7e3857 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
@@ -449,7 +449,8 @@ public class IndexManager {
     }
 
     boolean returnIdsOnly = false;
-    if (selector.columnFamiliesToFetch.isEmpty() && selector.columnsToFetch.isEmpty())
{
+    if (selector.columnFamiliesToFetch != null && selector.columnsToFetch != null
+        && selector.columnFamiliesToFetch.isEmpty() && selector.columnsToFetch.isEmpty())
{
       // exit early
       returnIdsOnly = true;
     }
@@ -486,8 +487,7 @@ public class IndexManager {
           fetchResult.rowResult = new FetchRowResult();
           fetchResult.rowResult.row = new Row(rowId, null, recordCount);
         } else {
-          List<Document> docs = BlurUtil.fetchDocuments(reader, term, fieldVisitor,
-              selector);
+          List<Document> docs = BlurUtil.fetchDocuments(reader, term, fieldVisitor,
selector);
           fetchResult.rowResult = new FetchRowResult(getRow(docs));
         }
         return;


Mime
View raw message