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 2016/07/20 11:59:22 UTC
[3/3] lucene-solr:branch_6x: SOLR-9275: fix NPE in SolrCoreParser.init
SOLR-9275: fix NPE in SolrCoreParser.init
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a4970c86
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a4970c86
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a4970c86
Branch: refs/heads/branch_6x
Commit: a4970c8685899d1262320b056992874dd672a40f
Parents: 80a2e73
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Jul 19 11:28:57 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Jul 20 11:32:47 2016 +0100
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/search/SolrCoreParser.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a4970c86/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 1e0e5bd..4857b75 100755
--- a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
@@ -43,6 +43,9 @@ public class SolrCoreParser extends CoreParser implements NamedListInitializedPl
@Override
public void init(NamedList initArgs) {
+ if (initArgs == null || initArgs.size() == 0) {
+ return;
+ }
final SolrResourceLoader loader;
if (req == null) {
loader = new SolrResourceLoader();