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

SOLR-9867: make sure cores are assigned in the end of SolrDispatchFilter.createCoreContainer() only

This commit is contained in:
Mikhail Khludnev 2017-05-04 15:45:14 +03:00
parent 32b7791fa8
commit 30f1422ba9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -333,7 +333,7 @@ Other Changes
* SOLR-10519: SolrCLI.atPath cannot handle children that begin with a slash. (Erick Erickson) * SOLR-10519: SolrCLI.atPath cannot handle children that begin with a slash. (Erick Erickson)
* SOLR-9867: Adding isLoading=true as core status. Fixing start after stop scenario in bin/solr * SOLR-9867: Adding isLoading=true as core status. Fixing start after stop scenario in bin/solr
(Mikhail Khludnev) (Andrey Kudryavtsev, Mikhail Khludnev)
================== 6.5.1 ================== ================== 6.5.1 ==================

6
solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
View File

@ -247,9 +247,9 @@ public class SolrDispatchFilter extends BaseSolrFilter {
*/ */
protected CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) { protected CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) {
NodeConfig nodeConfig = loadNodeConfig(solrHome, extraProperties); NodeConfig nodeConfig = loadNodeConfig(solrHome, extraProperties);
cores = new CoreContainer(nodeConfig, extraProperties, true); CoreContainer coreContainer = new CoreContainer(nodeConfig, extraProperties, true);
cores.load(); coreContainer.load();
return cores; return coreContainer;
} }
/** /**