SOLR-5474 Fix NPE in tests (some more)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1626602 13f79535-47bb-0310-9956-ffa450edef68
2014-09-21 16:02:00 +00:00 · 2014-09-21 16:02:00 +00:00 · 07dec8cab8
parent 9f952f0fbf
commit 07dec8cab8
1 changed files with 3 additions and 1 deletions
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
@ -719,7 +719,9 @@ public class CloudSolrServer extends SolrServer {
        }
      }

-      requestedCollections.clear(); // done with this
+      if (requestedCollections != null) {
+        requestedCollections.clear(); // done with this
+      }

      // if the state was stale, then we retry the request once with new state pulled from Zk
      if (stateWasStale) {