You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by yo...@apache.org on 2010/12/14 15:52:03 UTC

svn commit: r1049116 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java

Author: yonik
Date: Tue Dec 14 14:52:03 2010
New Revision: 1049116

URL: http://svn.apache.org/viewvc?rev=1049116&view=rev
Log:
MTQ - null can be a valid comparator for newTermComp too

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java?rev=1049116&r1=1049115&r2=1049116&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java Tue Dec 14 14:52:03 2010
@@ -66,7 +66,7 @@ abstract class TermCollectingRewrite<Q e
       
       // Check comparator compatibility:
       final Comparator<BytesRef> newTermComp = termsEnum.getComparator();
-      if (lastTermComp != null && newTermComp != lastTermComp)
+      if (lastTermComp != null && newTermComp != null && newTermComp != lastTermComp)
         throw new RuntimeException("term comparator should not change between segments: "+lastTermComp+" != "+newTermComp);
       lastTermComp = newTermComp;