You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2026/09/23 14:01:15 UTC

(solr) 04/04: SOLR-18473: Fix CrossDC Consumer NPE on shutdown. (#4932)

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch branch_10x
in repository https://gitbox.apache.org/repos/asf/solr.git

commit 997d8a8b27dd0d70ba86c372f02f43f03d004215
Author: Andrzej BiaƂecki <ab...@apache.org>
AuthorDate: Tue Sep 22 18:46:14 2026 +0200

    SOLR-18473: Fix CrossDC Consumer NPE on shutdown. (#4932)
    
    (cherry picked from commit b7850a48cafe39bdd55ca6abae011bfc0911b9c0)
---
 .../java/org/apache/solr/response/PrometheusResponseWriter.java  | 3 +++
 .../org/apache/solr/response/TestPrometheusResponseWriter.java   | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PrometheusResponseWriter.java
index 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.java
index 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));
+  }
+
   @Test
   public void testUnsupportedMetricsFormat() throws Exception {
     var req = new MetricsRequest();