Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1414 implicit core properties are not set for single core 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@811769 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2009-09-06 06:36:50 +00:00
parent 5324b752cb
commit 9fe0028cd0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -292,6 +292,8 @@ New Features
75. SOLR-1385 : Add an 'enable' attribute to all plugins (noble) 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 Optimizations
---------------------- ----------------------
1. SOLR-374: Use IndexReader.reopen to save resources by re-using parts of the 1. SOLR-374: Use IndexReader.reopen to save resources by re-using parts of the

12
src/java/org/apache/solr/core/CoreContainer.java
View File

@ -126,12 +126,14 @@ public class CoreContainer
solrConfigFilename = cores.getConfigFile().getName(); solrConfigFilename = cores.getConfigFile().getName();
} else { } else {
// perform compatibility init // perform compatibility init
SolrResourceLoader resourceLoader = new SolrResourceLoader(solrHome, null, getCoreProps(solrHome, null,null)); cores = new CoreContainer(solrHome);
cores = new CoreContainer(resourceLoader); 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 ? SolrConfig cfg = solrConfigFilename == null ?
new SolrConfig(resourceLoader, SolrConfig.DEFAULT_CONF_FILE,null) : new SolrConfig(resourceLoader, SolrConfig.DEFAULT_CONF_FILE,null) :
new SolrConfig(resourceLoader, solrConfigFilename,null); new SolrConfig(resourceLoader, solrConfigFilename,null);
CoreDescriptor dcore = new CoreDescriptor(cores, "", ".");
SolrCore singlecore = new SolrCore(null, null, cfg, null, dcore); SolrCore singlecore = new SolrCore(null, null, cfg, null, dcore);
abortOnConfigurationError = cfg.getBool( abortOnConfigurationError = cfg.getBool(
"abortOnConfigurationError", abortOnConfigurationError); "abortOnConfigurationError", abortOnConfigurationError);
@ -188,6 +190,10 @@ public class CoreContainer
this.solrHome = loader.getInstanceDir(); this.solrHome = loader.getInstanceDir();
} }
public CoreContainer(String solrHome) {
this.solrHome = solrHome;
}
//------------------------------------------------------------------- //-------------------------------------------------------------------
// Initialization / Cleanup // Initialization / Cleanup
//------------------------------------------------------------------- //-------------------------------------------------------------------