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/01/23 16:49:08 UTC

svn commit: r1654245 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java

Author: rmuir
Date: Fri Jan 23 15:49:08 2015
New Revision: 1654245

URL: http://svn.apache.org/r1654245
Log:
fix docID() when multi-phrase enum hits NO_MORE_DOCS

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1654245&r1=1654244&r2=1654245&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java Fri Jan 23 15:49:08 2015
@@ -499,7 +499,7 @@ class UnionDocsAndPositionsEnum extends
   @Override
   public final int nextDoc() throws IOException {
     if (_queue.size() == 0) {
-      return NO_MORE_DOCS;
+      return _doc = NO_MORE_DOCS;
     }
 
     // TODO: move this init into positions(): if the search