lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cpoersc...@apache.org
Subject lucene-solr:master: SOLR-9275: fix NPE in SolrCoreParser.init
Date Tue, 19 Jul 2016 10:41:19 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 5c4b7173a -> 832dacffc


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/832dacff
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/832dacff
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/832dacff

Branch: refs/heads/master
Commit: 832dacffc8dddfef07456624660118a593f176bd
Parents: 5c4b717
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Tue Jul 19 11:28:57 2016 +0100
Committer: Christine Poerschke <cpoerschke@apache.org>
Committed: Tue Jul 19 11:28:57 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/832dacff/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();


Mime
View raw message