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 no...@apache.org on 2009/09/06 08:36:50 UTC
svn commit: r811769 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/core/CoreContainer.java
Author: noble
Date: Sun Sep 6 06:36:50 2009
New Revision: 811769
URL: http://svn.apache.org/viewvc?rev=811769&view=rev
Log:
SOLR-1414 implicit core properties are not set for single core
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=811769&r1=811768&r2=811769&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sun Sep 6 06:36:50 2009
@@ -292,6 +292,8 @@
75. SOLR-1385 : Add an 'enable' attribute to all plugins (noble)
+76. SOLR-SOLR-1414 : implicit core properties are not set for single core (noble)
+
Optimizations
----------------------
1. SOLR-374: Use IndexReader.reopen to save resources by re-using parts of the
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java?rev=811769&r1=811768&r2=811769&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java Sun Sep 6 06:36:50 2009
@@ -126,12 +126,14 @@
solrConfigFilename = cores.getConfigFile().getName();
} else {
// perform compatibility init
- SolrResourceLoader resourceLoader = new SolrResourceLoader(solrHome, null, getCoreProps(solrHome, null,null));
- cores = new CoreContainer(resourceLoader);
+ cores = new CoreContainer(solrHome);
+ CoreDescriptor dcore = new CoreDescriptor(cores, "", ".");
+ dcore.setCoreProperties(null);
+ SolrResourceLoader resourceLoader = new SolrResourceLoader(solrHome, null, getCoreProps(solrHome, null,dcore.getCoreProperties()));
+ cores.loader = resourceLoader;
SolrConfig cfg = solrConfigFilename == null ?
new SolrConfig(resourceLoader, SolrConfig.DEFAULT_CONF_FILE,null) :
new SolrConfig(resourceLoader, solrConfigFilename,null);
- CoreDescriptor dcore = new CoreDescriptor(cores, "", ".");
SolrCore singlecore = new SolrCore(null, null, cfg, null, dcore);
abortOnConfigurationError = cfg.getBool(
"abortOnConfigurationError", abortOnConfigurationError);
@@ -188,6 +190,10 @@
this.solrHome = loader.getInstanceDir();
}
+ public CoreContainer(String solrHome) {
+ this.solrHome = solrHome;
+ }
+
//-------------------------------------------------------------------
// Initialization / Cleanup
//-------------------------------------------------------------------