Apache Solr open-source search software
SOLR-18473: Fix CrossDC Consumer NPE on shutdown. (#4932)
Andrzej Białeckib7850a48cafe
diff --git a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.javaindex d56a85b9bbe..f2628bb9240 100644--- a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java@@ -85,6 +85,9 @@ public class PrometheusResponseWriter implements QueryResponseWriter {}private boolean writeOpenMetricsFormat(SolrQueryRequest request) {+ if (request == null) {+ return false;+ }String wt = request.getParams().get(CommonParams.WT);if (MetricUtils.OPEN_METRICS_WT.equals(wt)) {return true;diff --git a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.javaindex 3c6032df129..a3848eb4c3f 100644--- a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java+++ b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java@@ -180,6 +180,15 @@ public class TestPrometheusResponseWriter extends SolrTestCaseJ4 {}}+ @Test+ public void testNullRequestDefaultsToPrometheusFormat() {+ PrometheusResponseWriter writer = new PrometheusResponseWriter();+ assertEquals(+ "Null request should not NPE and should default to Prometheus format",+ PrometheusResponseWriter.CONTENT_TYPE_PROMETHEUS,+ writer.getContentType(null, null));+ }+@Testpublic void testUnsupportedMetricsFormat() throws Exception {var req = new MetricsRequest();