You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/03/26 18:33:05 UTC

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

Author: shalin
Date: Thu Mar 26 17:33:04 2015
New Revision: 1669374

URL: http://svn.apache.org/r1669374
Log:
SOLR-6673: Fix 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=1669374&r1=1669373&r2=1669374&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 Thu Mar 26 17:33:04 2015
@@ -363,7 +363,9 @@ public class SolrDispatchFilter extends
           // try the default core
           if (core == null) {
             core = cores.getCore("");
-            addMDCValues(cores, core);
+            if (core != null) {
+              addMDCValues(cores, core);
+            }
           }
         }