You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/07/05 00:10:20 UTC
[05/10] lucene-solr:feature/autoscaling: SOLR-10957: Changed
SolrCoreParser.init to use the resource loader from getSchema() instead of
the resource loader from getCore().
SOLR-10957: Changed SolrCoreParser.init to use the resource loader from getSchema() instead of the resource loader from getCore().
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/db71c561
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/db71c561
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/db71c561
Branch: refs/heads/feature/autoscaling
Commit: db71c5615ac2f150e6e0b9f8e4126a0d46a29ef6
Parents: d3c67cf
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Jul 4 12:02:40 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Jul 4 14:13:00 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/search/SolrCoreParser.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db71c561/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8c5f2c1..1517163 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -74,6 +74,9 @@ Other Changes
* SOLR-10827: Factor out abstract FilteringSolrMetricReporter class. (Christine Poerschke)
+* SOLR-10957: Changed SolrCoreParser.init to use the resource loader from getSchema()
+ instead of the resource loader from getCore(). (Christine Poerschke)
+
================== 7.0.0 ==================
Versions of Major Components
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db71c561/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
index 0a2cf58..a5c2b03 100755
--- a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
@@ -57,7 +57,7 @@ public class SolrCoreParser extends CoreParser implements NamedListInitializedPl
if (req == null) {
loader = new SolrResourceLoader();
} else {
- loader = req.getCore().getResourceLoader();
+ loader = req.getSchema().getResourceLoader();
}
final Iterable<Map.Entry<String,Object>> args = initArgs;