You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/05/26 22:04:19 UTC
lucene-solr:branch_6_6: SOLR-10735: Fixing windows space directory
issue
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_6 bfb1ee42b -> 732e8331c
SOLR-10735: Fixing windows space directory issue
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/732e8331
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/732e8331
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/732e8331
Branch: refs/heads/branch_6_6
Commit: 732e8331cf984c0ebe02e20f70daacd82817bd4e
Parents: bfb1ee4
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Sat May 27 03:30:27 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Sat May 27 03:34:03 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/732e8331/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b6341f9..8a34d02 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -236,6 +236,9 @@ Bug Fixes
"lucene"/standard query parser, should require " TO " in range queries,
and accept "TO" as endpoints in range queries. (hossman, Steve Rowe)
+* SOLR-10735: Windows script (solr.cmd) didn't work properly with directory containing spaces. Adding quotations
+ to fix (Uwe Schindler, janhoy, Tomas Fernandez-Lobbe, Ishan Chattopadhyaya)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/732e8331/solr/core/src/java/org/apache/solr/util/SolrCLI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index aa7c8b5..adcd5ae 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2929,7 +2929,7 @@ public class SolrCLI {
solrHome = solrHome.substring(cwdPath.length()+1);
String startCmd =
- String.format(Locale.ROOT, "%s start %s -p %d -s \"%s\" %s %s %s %s %s",
+ String.format(Locale.ROOT, "\"%s\" start %s -p %d -s \"%s\" %s %s %s %s %s",
callScript, cloudModeArg, port, solrHome, hostArg, zkHostArg, memArg, extraArgs, addlOptsArg);
startCmd = startCmd.replaceAll("\\s+", " ").trim(); // for pretty printing