svn commit: r890817 - in /lucene/solr/branches/cloud: build.xml src/java/org/apache/solr/core/CoreContainer.java

[ma...@apache.org]

Author: markrmiller
Date: Tue Dec 15 15:08:22 2009
New Revision: 890817

URL: http://svn.apache.org/viewvc?rev=890817&view=rev
Log:
fix data dir not being set in multi-core startup

Modified:
    lucene/solr/branches/cloud/build.xml
    lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java

Modified: lucene/solr/branches/cloud/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/build.xml?rev=890817&r1=890816&r2=890817&view=diff
==============================================================================
--- lucene/solr/branches/cloud/build.xml (original)
+++ lucene/solr/branches/cloud/build.xml Tue Dec 15 15:08:22 2009
@@ -394,7 +394,6 @@
            dir="src/test/test-files/"
            >
       <jvmarg line="${args}"/>
-      <jvmarg line="-Djava.util.logging.config.file=log.properties"/>
       <formatter type="brief" usefile="false" if="junit.details"/>
       <classpath refid="test.run.classpath"/>
       <formatter type="${junit.formatter}"/>

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java?rev=890817&r1=890816&r2=890817&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java Tue Dec 15 15:08:22 2009
@@ -292,6 +292,7 @@
           }
           opt = DOMUtil.getAttr(node, CoreAdminParams.DATA_DIR, null);
           if(solrDataDirOverride != null && name.equals("")) {
+            System.out.println("set data dir override:" + solrDataDirOverride);
             p.setDataDir(solrDataDirOverride);
           }else if (opt != null) {
             p.setDataDir(opt);
@@ -468,7 +469,7 @@
         schema = new IndexSchema(config, dcore.getSchemaName(), null);
       }
     }
-    SolrCore core = new SolrCore(dcore.getName(), null, config, schema, dcore);
+    SolrCore core = new SolrCore(dcore.getName(), dcore.getDataDir(), config, schema, dcore);
     return core;
   }