Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E5755200B43 for ; Tue, 19 Jul 2016 12:41:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E4122160A89; Tue, 19 Jul 2016 10:41:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5F882160A76 for ; Tue, 19 Jul 2016 12:41:20 +0200 (CEST) Received: (qmail 85024 invoked by uid 500); 19 Jul 2016 10:41:19 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 85015 invoked by uid 99); 19 Jul 2016 10:41:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2016 10:41:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3862AE03A6; Tue, 19 Jul 2016 10:41:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cpoerschke@apache.org To: commits@lucene.apache.org Message-Id: <317c3be31b734fb58ed4977be1a6b3eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:master: SOLR-9275: fix NPE in SolrCoreParser.init Date: Tue, 19 Jul 2016 10:41:19 +0000 (UTC) archived-at: Tue, 19 Jul 2016 10:41:21 -0000 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 Authored: Tue Jul 19 11:28:57 2016 +0100 Committer: Christine Poerschke 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();