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/03/12 16:46:01 UTC
lucene-solr:jira/solr-6736: SOLR-6736: Accept . as resource path for
the folder itself
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-6736 f664f1f39 -> b198c6014
SOLR-6736: Accept . as resource path for the folder itself
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b198c601
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b198c601
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b198c601
Branch: refs/heads/jira/solr-6736
Commit: b198c60143865280abce2c7a660e6df39aad4f40
Parents: f664f1f
Author: Ishan Chattopadhyaya <is...@apache.org>
Authored: Sun Mar 12 22:15:47 2017 +0530
Committer: Ishan Chattopadhyaya <is...@apache.org>
Committed: Sun Mar 12 22:15:47 2017 +0530
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java | 5 +----
solr/core/src/java/org/apache/solr/core/ConfigSetService.java | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b198c601/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
index c2b6bbb..f850da8 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
@@ -81,10 +81,7 @@ public class ZkSolrResourceLoader extends SolrResourceLoader {
@Override
public InputStream openResource(String resource) throws IOException {
InputStream is;
- String file = configSetZkPath + "/" + resource;
- if (file.endsWith("/")) {
- file = file.substring(0, file.length()-1);
- }
+ String file = (resource.equals(".")) ? configSetZkPath : configSetZkPath + "/" + resource;
int maxTries = 10;
Exception exception = null;
while (maxTries -- > 0) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b198c601/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
index 5e68b70..8ab63b2 100644
--- a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
+++ b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java
@@ -130,7 +130,7 @@ public abstract class ConfigSetService {
protected NamedList getConfigSetFlags(CoreDescriptor cd, SolrResourceLoader loader) {
if (loader instanceof ZkSolrResourceLoader) {
try {
- return ConfigSetProperties.readFromResourceLoader(loader, "");
+ return ConfigSetProperties.readFromResourceLoader(loader, ".");
} catch (Exception ex) {
return null;
}