Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16648: NullPointerException when excluding facets in More Like This Handler (#1339)

Mikhail Khludnev96f690cddf07
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0da2215662d..d5591cd2049 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -195,6 +195,8 @@ Bug Fixes
* SOLR-16647: Fix circuit breaker examples in solrconfig.xml (Colvin Cowie via Kevin Risden)
+* SOLR-16648: NullPointerException when excluding facets in More Like This Handler (Mikhail Khludnev)
+
Build
---------------------
* Upgrade forbiddenapis to 3.4 (Uwe Schindler)
diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
index 08277ffb8a2..2192aa9cabe 100644
--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
@@ -218,6 +218,7 @@ public class MoreLikeThisHandler extends RequestHandlerBase {
} else {
final ResponseBuilder responseBuilder =
new ResponseBuilder(req, rsp, Collections.emptyList());
+ responseBuilder.setQuery(mlt.getRealMLTQuery());
SimpleFacets f = new SimpleFacets(req, mltDocs.docSet, params, responseBuilder);
FacetComponent.FacetContext.initContext(responseBuilder);
rsp.add("facet_counts", FacetComponent.getFacetCounts(f));
diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
index c218b08938e..df7ec8ecb38 100644
--- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
@@ -246,6 +246,14 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
"//result/doc[1]/str[@name='id'][.='45']",
"//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='name']/int[@name='George'][.='1']");
}
+ params.set("facet.field", "{!ex=tg}name");
+ params.set("fq", "{!tag=tg}name:George");
+ try (SolrQueryRequest mltreq = new LocalSolrQueryRequest(core, params)) {
+ assertQ(
+ mltreq,
+ "//result/doc[1]/str[@name='id'][.='45']",
+ "//lst[@name='facet_counts']/lst[@name='facet_fields']/lst[@name='name']/int[@name='George'][.='1']");
+ }
}
@Test