svn commit: r891338 - /lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java

[markrmiller]

Author: markrmiller
Date: Wed Dec 16 17:30:27 2009
New Revision: 891338

URL: http://svn.apache.org/viewvc?rev=891338&view=rev
Log:
fix how test data dir override works with solrcore/corecontainer

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

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=891338&r1=891337&r2=891338&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 
Wed Dec 16 17:30:27 2009
@@ -294,10 +294,7 @@
             p.setPropertiesName(opt);
           }
           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) {
+          if (opt != null) {
             p.setDataDir(opt);
           }
 
@@ -472,7 +469,12 @@
         schema = new IndexSchema(config, dcore.getSchemaName(), null);
       }
     }
-    SolrCore core = new SolrCore(dcore.getName(), dcore.getDataDir(), config, 
schema, dcore);
+    String dataDir = null;
+    // allow test override
+    if(dcore.getName() == "") {
+      dataDir = solrDataDirOverride;
+    }
+    SolrCore core = new SolrCore(dcore.getName(), dataDir, config, schema, 
dcore);
     return core;
   }