[lucene-solr] Diff for: [GitHub] janhoy closed pull request #534: SOLR-13137: NPE when /admin/zookeeper/statusin standalone mode

[GitBox <gi...@apache.org>]

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7bd259ff456..8aa75277629 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -247,6 +247,8 @@ Bug Fixes
 * SOLR-13053: NodeAddedTrigger and NodeLostTrigger do not reserve added/removed time populated by restoreState
   (Cao Manh Dat)
 
+* SOLR-13137: NPE when /admin/zookeeper/status endpoint hit in standalone mode (janhoy)
+
 Improvements
 ----------------------
 
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
index 884243705e2..1f3a50401aa 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
@@ -32,7 +32,6 @@
 import java.util.stream.Collectors;
 
 import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.RequestHandlerBase;
@@ -73,10 +72,12 @@ public Category getCategory() {
 
   @Override
   public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
-    final SolrParams params = req.getParams();
-    Map<String, String> map = new HashMap<>(1);
     NamedList values = rsp.getValues();
-    values.add("zkStatus", getZkStatus(cores.getZkController().getZkServerAddress()));
+    if (cores.isZooKeeperAware()) {
+      values.add("zkStatus", getZkStatus(cores.getZkController().getZkServerAddress()));
+    } else {
+      throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "The Zookeeper status API is only available in Cloud mode");
+    }
   }
 
   /*


With regards,
Apache Git Services