Author: noble
Date: Wed Jun 10 11:09:05 2009
New Revision: 783290
URL: http://svn.apache.org/viewvc?rev=783290&view=rev
Log:
SOLR-1213 SolrResourceLoader.normalizeDir() should add OS specific file
separator
Modified:
lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java?rev=783290&r1=783289&r2=783290&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java Wed Jun
10 11:09:05 2009
@@ -43,7 +43,7 @@
if (instanceDir == null) {
throw new NullPointerException("Missing required \'instanceDir\'");
}
- if (!instanceDir.endsWith("/")) instanceDir = instanceDir + "/";
+ instanceDir = SolrResourceLoader.normalizeDir(instanceDir);
this.instanceDir = instanceDir;
this.configName = getDefaultConfigName();
this.schemaName = getDefaultSchemaName();
Modified:
lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java
URL:
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=783290&r1=783289&r2=783290&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java Wed
Jun 10 11:09:05 2009
@@ -134,7 +134,7 @@
/** Ensures a directory name always ends with a '/'. */
public static String normalizeDir(String path) {
- return ( path != null && (!(path.endsWith("/") || path.endsWith("\\"))) )?
path + '/' : path;
+ return ( path != null && (!(path.endsWith("/") || path.endsWith("\\"))) )?
path + File.separator : path;
}
public String getConfigDir() {
