svn commit: r818490 - /lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java

[markrmiller]

Author: markrmiller
Date: Thu Sep 24 14:11:49 2009
New Revision: 818490

URL: http://svn.apache.org/viewvc?rev=818490&view=rev
Log:
SOLR-1459: BoostedQuery needs to handle when its wrapped query weight returns 
null for the scorer

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java?rev=818490&r1=818489&r2=818490&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java 
(original)
+++ 
lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java 
Thu Sep 24 14:11:49 2009
@@ -93,6 +93,9 @@
     @Override
     public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean 
topScorer) throws IOException {
       Scorer subQueryScorer = qWeight.scorer(reader, true, false);
+      if(subQueryScorer == null) {
+        return null;
+      }
       return new BoostedQuery.CustomScorer(getSimilarity(searcher), searcher, 
reader, this, subQueryScorer, boostVal);
     }