lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r798482 - /lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
Date Tue, 28 Jul 2009 10:46:36 GMT
Author: shalin
Date: Tue Jul 28 10:46:36 2009
New Revision: 798482

URL: http://svn.apache.org/viewvc?rev=798482&view=rev
Log:
SOLR-1041 -- Fix issue with absolute instanceDir

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=798482&r1=798481&r2=798482&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 Tue Jul 28 10:46:36
2009
@@ -80,11 +80,12 @@
 
   /**@return the default data directory. */
   public String getDefaultDataDir() {
-    return coreContainer.loader.getInstanceDir() + SolrResourceLoader.normalizeDir(instanceDir)
+ "data"+File.separator;
+    return "data" + File.separator;
   }
 
   public String getDataDir() {
-    if (dataDir == null) return getDefaultDataDir();
+    String dataDir = this.dataDir;
+    if (dataDir == null) dataDir = getDefaultDataDir();
     if (new File(dataDir).isAbsolute()) {
       return dataDir;
     } else {



Mime
View raw message