You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/02/10 16:57:00 UTC

svn commit: r1242830 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Author: markrmiller
Date: Fri Feb 10 15:57:00 2012
New Revision: 1242830

URL: http://svn.apache.org/viewvc?rev=1242830&view=rev
Log:
if we cannot find a collection, return null rather than NPE

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1242830&r1=1242829&r2=1242830&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Fri Feb 10 15:57:00 2012
@@ -307,6 +307,9 @@ public class SolrDispatchFilter implemen
     
     CloudState cloudState = zkStateReader.getCloudState();
     Map<String,Slice> slices = cloudState.getSlices(collection);
+    if (slices == null) {
+      return null;
+    }
     // look for a core on this node
     Set<Entry<String,Slice>> entries = slices.entrySet();
     done: