Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-15061: Fix NPE in SearchHandler when shards.info and no QueryComponent configured

This commit is contained in:
Bruno Roustant 2020-12-24 11:43:04 +01:00
parent 1bb9755e4a
commit 5e21e3f380
No known key found for this signature in database
GPG Key ID: CD28DABB95360525
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -281,6 +281,8 @@ Bug Fixes
* SOLR-15031: Fix preventing null being wrapped in a QueryValueSource subQuery. Such null queries can be caused by query text * SOLR-15031: Fix preventing null being wrapped in a QueryValueSource subQuery. Such null queries can be caused by query text
resulting in an empty token stream. (Pieter van Boxtel via Mike Drob) resulting in an empty token stream. (Pieter van Boxtel via Mike Drob)
* SOLR-15061: Fix NPE in SearchHandler when shards.info and no QueryComponent configured. (Bruno Roustant)
Other Changes Other Changes
--------------------- ---------------------

3
solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
View File

@ -521,8 +521,7 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware,
StringWriter trace = new StringWriter(); StringWriter trace = new StringWriter();
cause.printStackTrace(new PrintWriter(trace)); cause.printStackTrace(new PrintWriter(trace));
nl.add("trace", trace.toString() ); nl.add("trace", trace.toString() );
} } else if (rb.getResults() != null) {
else {
nl.add("numFound", rb.getResults().docList.matches()); nl.add("numFound", rb.getResults().docList.matches());
nl.add("numFoundExact", rb.getResults().docList.hitCountRelation() == TotalHits.Relation.EQUAL_TO); nl.add("numFoundExact", rb.getResults().docList.hitCountRelation() == TotalHits.Relation.EQUAL_TO);
nl.add("maxScore", rb.getResults().docList.maxScore()); nl.add("maxScore", rb.getResults().docList.maxScore());