You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/04 17:10:40 UTC
[46/50] lucene-solr:jira/solr-8668: SOLR-9867: make sure cores are
assigned in the end of SolrDispatchFilter.createCoreContainer() only
SOLR-9867: make sure cores are assigned in the end of SolrDispatchFilter.createCoreContainer() only
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/30f1422b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/30f1422b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/30f1422b
Branch: refs/heads/jira/solr-8668
Commit: 30f1422ba955a38c37b1ec97244ebb7ede9ee7be
Parents: 32b7791
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Thu May 4 15:45:14 2017 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Thu May 4 15:45:14 2017 +0300
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
.../src/java/org/apache/solr/servlet/SolrDispatchFilter.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30f1422b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ab023cc..ddf694a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -333,7 +333,7 @@ Other Changes
* 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
- (Mikhail Khludnev)
+ (Andrey Kudryavtsev, Mikhail Khludnev)
================== 6.5.1 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30f1422b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 02b0460..c4e0d0d 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -247,9 +247,9 @@ public class SolrDispatchFilter extends BaseSolrFilter {
*/
protected CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) {
NodeConfig nodeConfig = loadNodeConfig(solrHome, extraProperties);
- cores = new CoreContainer(nodeConfig, extraProperties, true);
- cores.load();
- return cores;
+ CoreContainer coreContainer = new CoreContainer(nodeConfig, extraProperties, true);
+ coreContainer.load();
+ return coreContainer;
}
/**