This is an automated email from the ASF dual-hosted git repository. epugh pushed a commit to branch branch_9x in repository https://gitbox.apache.org/repos/asf/solr.git
commit b7daf742ecb1f5a7ceb3a94cb292817714e62d7a Author: Eric Pugh <[email protected]> AuthorDate: Thu Oct 17 13:30:57 2024 -0400 Support backport of SOLR-17489 --- solr/core/src/java/org/apache/solr/cli/PostTool.java | 2 +- solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cli/PostTool.java b/solr/core/src/java/org/apache/solr/cli/PostTool.java index f8ee89d3102..f8c92d2d4b8 100644 --- a/solr/core/src/java/org/apache/solr/cli/PostTool.java +++ b/solr/core/src/java/org/apache/solr/cli/PostTool.java @@ -316,7 +316,7 @@ public class PostTool extends ToolBase { "Must specify -c / --name parameter with --solr-url to post documents."); } String url = - SolrCLI.normalizeSolrUrl(cli) + "/" + cli.getOptionValue("name") + "/update"; + SolrCLI.normalizeSolrUrl(cli) + "/solr/" + cli.getOptionValue("name") + "/update"; solrUpdateUrl = new URI(url); } else if (cli.hasOption("solr-update-url")) { diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java index 9e23ff72f34..45af136a4fa 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -792,10 +792,11 @@ public class SolrCLI implements CLIO { String firstLiveNode = liveNodes.iterator().next(); solrUrl = ZkStateReader.from(cloudSolrClient).getBaseUrlForNodeName(firstLiveNode); - solrUrl = normalizeSolrUrl(solrUrl, false); + // solrUrl = normalizeSolrUrl(solrUrl, false); } } } + solrUrl = normalizeSolrUrl(solrUrl, false); return solrUrl; }
