Revert /solr fix, always normalize

apache · Oct 18, 2024 · c660d0a · c660d0a
1 parent e80504a
commit c660d0a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 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
@@ -315,8 +315,7 @@ public void runImpl(CommandLine cli) throws Exception {
         throw new IllegalArgumentException(
             "Must specify -c / --name parameter with --solr-url to post documents.");
       }
-      String url =
-          SolrCLI.normalizeSolrUrl(cli) + "/solr/" + cli.getOptionValue("name") + "/update";
+      String url = SolrCLI.normalizeSolrUrl(cli) + "/" + 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
@@ -792,10 +792,10 @@ public static String normalizeSolrUrl(CommandLine cli) throws Exception {
 
           String firstLiveNode = liveNodes.iterator().next();
           solrUrl = ZkStateReader.from(cloudSolrClient).getBaseUrlForNodeName(firstLiveNode);
-          solrUrl = normalizeSolrUrl(solrUrl, false);
         }
       }
     }
+    solrUrl = normalizeSolrUrl(solrUrl, false);
     return solrUrl;
   }