You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/04/28 13:31:31 UTC

svn commit: r1676489 - in /lucene/dev/trunk: ./ lucene/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java

Author: rmuir
Date: Tue Apr 28 11:31:31 2015
New Revision: 1676489

URL: http://svn.apache.org/r1676489
Log:
fix test bug

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/test-framework/   (props changed)
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java?rev=1676489&r1=1676488&r2=1676489&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java Tue Apr 28 11:31:31 2015
@@ -521,6 +521,10 @@ public class QueryUtils {
       final BulkScorer bulkScorer = weight.bulkScorer(context, context.reader().getLiveDocs());
       if (scorer == null && bulkScorer == null) {
         continue;
+      } else if (bulkScorer == null) {
+        // ensure scorer is exhausted (it just didnt return null)
+        assert scorer.nextDoc() == DocIdSetIterator.NO_MORE_DOCS;
+        continue;
       }
       int upTo = 0;
       while (true) {