From fe9b072490c7545b9b0870238d98bfa19f8d529d Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Wed, 14 Mar 2012 01:34:07 +0000
Subject: [PATCH] defend against npe

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1300434 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/java/org/apache/solr/servlet/SolrDispatchFilter.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 5c65189ab13..4c5656dcfb9 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -308,7 +308,9 @@ public class SolrDispatchFilter implements Filter
     for (Entry<String,Slice> entry : entries) {
       // first see if we have the leader
       ZkNodeProps leaderProps = cloudState.getLeader(collection, entry.getKey());
-      core = checkProps(cores, path, leaderProps);
+      if (leaderProps != null) {
+        core = checkProps(cores, path, leaderProps);
+      }
       if (core != null) {
         break done;
       }