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/07/04 14:31:45 UTC
[2/2] lucene-solr:branch_7x: 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/be06dd30
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/be06dd30
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/be06dd30
Branch: refs/heads/branch_7x
Commit: be06dd30c829632ee3b590bbe514faaa25d1a71d
Parents: 53cb155
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:18:24 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/be06dd30/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ef852d0..68614db 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -57,6 +57,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/be06dd30/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;