Return-Path: Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org Received: (qmail 70986 invoked from network); 24 Sep 2009 14:12:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 14:12:14 -0000 Received: (qmail 51792 invoked by uid 500); 24 Sep 2009 14:12:14 -0000 Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org Received: (qmail 51724 invoked by uid 500); 24 Sep 2009 14:12:14 -0000 Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: solr-dev@lucene.apache.org Delivered-To: mailing list solr-commits@lucene.apache.org Received: (qmail 51715 invoked by uid 99); 24 Sep 2009 14:12:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 14:12:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 14:12:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5E1AF23888D4; Thu, 24 Sep 2009 14:11:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818490 - /lucene/solr/trunk/src/java/org/apache/solr/search/function/BoostedQuery.java Date: Thu, 24 Sep 2009 14:11:50 -0000 To: solr-commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924141150.5E1AF23888D4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); }