lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1626602 - /lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
Date Sun, 21 Sep 2014 16:02:00 GMT
Author: sarowe
Date: Sun Sep 21 16:02:00 2014
New Revision: 1626602

URL: http://svn.apache.org/r1626602
Log:
SOLR-5474 Fix NPE in tests (some more)

Modified:
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1626602&r1=1626601&r2=1626602&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
Sun Sep 21 16:02:00 2014
@@ -719,7 +719,9 @@ public class CloudSolrServer extends Sol
         }
       }
 
-      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) {



Mime
View raw message