You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2014/02/09 17:34:37 UTC
svn commit: r1566309 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
Author: jbernste
Date: Sun Feb 9 16:34:36 2014
New Revision: 1566309
URL: http://svn.apache.org/r1566309
Log:
SOLR-5624: Guard against NPE during cache warming
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java?rev=1566309&r1=1566308&r2=1566309&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java Sun Feb 9 16:34:36 2014
@@ -305,8 +305,12 @@ public class CollapsingQParserPlugin ext
int maxDoc = searcher.maxDoc();
int leafCount = searcher.getTopReaderContext().leaves().size();
- SolrRequestInfo info = SolrRequestInfo.getRequestInfo();
- this.boosted = (Set<String>)info.getReq().getContext().get(QueryElevationComponent.BOOSTED);
+ if(this.boosted == null) {
+ SolrRequestInfo info = SolrRequestInfo.getRequestInfo();
+ if(info != null) {
+ this.boosted = (Set<String>)info.getReq().getContext().get(QueryElevationComponent.BOOSTED);
+ }
+ }
IntOpenHashSet boostDocs = getBoostDocs(searcher, this.boosted);