lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1669375 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
Date Thu, 26 Mar 2015 17:33:53 GMT
Author: shalin
Date: Thu Mar 26 17:33:53 2015
New Revision: 1669375

URL: http://svn.apache.org/r1669375
Log:
SOLR-6673: Fix NPE

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1669375&r1=1669374&r2=1669375&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
(original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
Thu Mar 26 17:33:53 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);
+            }
           }
         }
 



Mime
View raw message