You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2008/09/06 22:56:08 UTC
svn commit: r692735 - in /lucene/solr/branches/branch-1.3: ./
src/java/org/apache/solr/core/CoreContainer.java
Author: yonik
Date: Sat Sep 6 13:56:07 2008
New Revision: 692735
URL: http://svn.apache.org/viewvc?rev=692735&view=rev
Log:
SOLR-753: CoreDescriptor holds wrong instance dir for single core
Modified:
lucene/solr/branches/branch-1.3/ (props changed)
lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java
Propchange: lucene/solr/branches/branch-1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 6 13:56:07 2008
@@ -1 +1 @@
-/lucene/solr/trunk:690332,691270,691716,691756,692549
+/lucene/solr/trunk:690332,691270,691716,691756,692549,692734
Modified: lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java?rev=692735&r1=692734&r2=692735&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java Sat Sep 6 13:56:07 2008
@@ -115,7 +115,7 @@
// perform compatibility init
cores = new CoreContainer(new SolrResourceLoader(instanceDir));
SolrConfig cfg = solrConfigFilename == null ? new SolrConfig() : new SolrConfig(solrConfigFilename);
- CoreDescriptor dcore = new CoreDescriptor(cores, "", cfg.getResourceLoader().getInstanceDir());
+ CoreDescriptor dcore = new CoreDescriptor(cores, "", ".");
SolrCore singlecore = new SolrCore(null, null, cfg, null, dcore);
abortOnConfigurationError = cfg.getBool(
"abortOnConfigurationError", abortOnConfigurationError);