From 228888a882c9775427b00a31c1276a9ce71c0e3d Mon Sep 17 00:00:00 2001
From: Michael McCandless <mikemccand@apache.org>
Date: Sat, 25 Jul 2009 09:31:17 +0000
Subject: [PATCH] LUCENE-1644: fix highlighter to rewrite MTQ whenever it's not
 already a SCORING_BOOLEAN_QUERY

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@797728 13f79535-47bb-0310-9956-ffa450edef68
---
 .../lucene/search/highlight/WeightedSpanTermExtractor.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
index fe20af0d604..586fbd7177f 100644
--- a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
+++ b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
@@ -136,7 +136,7 @@ public class WeightedSpanTermExtractor {
       terms.putAll(disjunctTerms);
     } else if (query instanceof MultiTermQuery && (highlightCnstScrRngQuery || expandMultiTermQuery)) {
       MultiTermQuery mtq = ((MultiTermQuery)query);
-      if(mtq.getRewriteMethod() == MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE) {
+      if(mtq.getRewriteMethod() != MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE) {
         mtq = copyMultiTermQuery(mtq);
         mtq.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
         query = mtq;