From a4970c8685899d1262320b056992874dd672a40f Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Tue, 19 Jul 2016 11:28:57 +0100
Subject: [PATCH] SOLR-9275: fix NPE in SolrCoreParser.init

---
 solr/core/src/java/org/apache/solr/search/SolrCoreParser.java | 3 +++
 1 file changed, 3 insertions(+)

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 1e0e5bd8365..4857b7534bd 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();