Author: shalin
Date: Mon Feb 23 13:41:43 2009
New Revision: 747016
URL: http://svn.apache.org/viewvc?rev=747016&view=rev
Log:
Use File.isAbsolute for checking absolute path
Modified:
lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.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=747016&r1=747015&r2=747016&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 Mon Feb
23 13:41:43 2009
@@ -85,11 +85,11 @@
public String getDataDir() {
if (dataDir == null) return getDefaultDataDir();
- String absolutePath = new File(dataDir).getAbsolutePath();
- if (absolutePath.equals(dataDir) || (absolutePath +
File.separator).equals(dataDir)) return dataDir;
- return dataDir.endsWith(File.separator) ?
- instanceDir + dataDir :
- instanceDir + dataDir + File.separator;
+ if (new File(dataDir).isAbsolute()) {
+ return dataDir;
+ } else {
+ return SolrResourceLoader.normalizeDir(instanceDir + dataDir);
+ }
}
public void setDataDir(String s) {
