Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16152 Print helpful error instead of NPE when using bin/solr package in standalone (#1150)

Jan Høydahl768322824794
diff --git a/solr/core/src/java/org/apache/solr/util/PackageTool.java b/solr/core/src/java/org/apache/solr/util/PackageTool.java
index c045ffb5cd4..9605af748d3 100644
--- a/solr/core/src/java/org/apache/solr/util/PackageTool.java
+++ b/solr/core/src/java/org/apache/solr/util/PackageTool.java
@@ -77,6 +77,9 @@ public class PackageTool extends SolrCLI.ToolBase {
solrBaseUrl = solrUrl.replaceAll("\\/solr$", ""); // strip out ending "/solr"
log.info("Solr url:{}, solr base url: {}", solrUrl, solrBaseUrl);
String zkHost = getZkHost(cli);
+ if (zkHost == null) {
+ throw new SolrException(ErrorCode.INVALID_STATE, "Package manager runs only in SolrCloud");
+ }
log.info("ZK: {}", zkHost);
String cmd = cli.getArgList().size() == 0 ? "help" : cli.getArgs()[0];