You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 23:00:44 UTC
[3/3] lucene-solr:branch_6_0: SOLR-9151: Fix SolrCLI so that bin/solr
-e cloud example can be run from any CWD (cherry picked from commit 50c4f58)
SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD
(cherry picked from commit 50c4f58)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b866e594
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b866e594
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b866e594
Branch: refs/heads/branch_6_0
Commit: b866e594d18ae47271b87e7dedd06ae26d622801
Parents: a7f2876
Author: Jan H�ydahl <ja...@apache.org>
Authored: Tue May 24 12:56:31 2016 +0200
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 19:00:14 2016 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b866e594/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 6d5aa8f..3c2b609 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2490,7 +2490,7 @@ public class SolrCLI {
String solrHome = solrHomeDir.getAbsolutePath();
// don't display a huge path for solr home if it is relative to the cwd
- if (!isWindows && solrHome.startsWith(cwdPath))
+ if (!isWindows && cwdPath.length() > 1 && solrHome.startsWith(cwdPath))
solrHome = solrHome.substring(cwdPath.length()+1);
String startCmd =