You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2014/10/28 17:50:25 UTC

svn commit: r1634912 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java

Author: hossman
Date: Tue Oct 28 16:50:25 2014
New Revision: 1634912

URL: http://svn.apache.org/r1634912
Log:
SOLR-6655: fix forbidden API for real this time

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java?rev=1634912&r1=1634911&r2=1634912&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java Tue Oct 28 16:50:25 2014
@@ -221,7 +221,7 @@ public class SimplePostTool {
       String port = System.getProperty("port", DEFAULT_POST_PORT);
       String core = System.getProperty("c", DEFAULT_POST_CORE);
 
-      urlStr = System.getProperty("url", String.format("http://%s:%s/solr/%s/update", host, port, core, Locale.ROOT));
+      urlStr = System.getProperty("url", String.format(Locale.ROOT, "http://%s:%s/solr/%s/update", host, port, core));
       urlStr = SimplePostTool.appendParam(urlStr, params);
       URL url = new URL(urlStr);
       boolean auto = isOn(System.getProperty("auto", DEFAULT_AUTO));
@@ -372,7 +372,7 @@ public class SimplePostTool {
      "Supported System Properties and their defaults:\n"+
      "  -Ddata=files|web|args|stdin (default=" + DEFAULT_DATA_MODE + ")\n"+
      "  -Dtype=<content-type> (default=" + DEFAULT_CONTENT_TYPE + ")\n"+
-     "  -Durl=<solr-update-url> (default=" + String.format("http://%s:%s/solr/%s/update", DEFAULT_POST_HOST, DEFAULT_POST_PORT, DEFAULT_POST_CORE, Locale.ROOT) + ")\n"+
+     "  -Durl=<solr-update-url> (default=" + String.format(Locale.ROOT, "http://%s:%s/solr/%s/update", DEFAULT_POST_HOST, DEFAULT_POST_PORT, DEFAULT_POST_CORE) + ")\n"+
      "  -Dhost=<host> (default: " + DEFAULT_POST_HOST+ ")\n"+
      "  -Dport=<port> (default: " + DEFAULT_POST_PORT+ ")\n"+
      "  -Dc=<core/collection> (default: " + DEFAULT_POST_CORE+ ")\n"+