From fbb8dc76e3c286811f4588f5cac475cc168e85ba Mon Sep 17 00:00:00 2001
From: Noble Paul <noble@apache.org>
Date: Wed, 3 Sep 2014 06:10:17 +0000
Subject: [PATCH] SOLR-6365 NPE bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1622168 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/core/src/java/org/apache/solr/core/ParamSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/core/ParamSet.java b/solr/core/src/java/org/apache/solr/core/ParamSet.java
index b997242fa4f..dc5807eb41b 100644
--- a/solr/core/src/java/org/apache/solr/core/ParamSet.java
+++ b/solr/core/src/java/org/apache/solr/core/ParamSet.java
@@ -89,7 +89,7 @@ public class ParamSet {
     if(first == null) first = new NamedList();
     NamedList nl = first.clone();
     if(appends) {
-      nl.addAll(second);
+      if(second!=null) nl.addAll(second);
     } else {
       Set<String> a = new HashSet<>();
       Set<String> b = new HashSet<>();