You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/11/09 17:18:20 UTC
svn commit: r1713471 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
Author: romseygeek
Date: Mon Nov 9 16:18:20 2015
New Revision: 1713471
URL: http://svn.apache.org/viewvc?rev=1713471&view=rev
Log:
SOLR-8254: HttpSolrCore.getCoreByCollection() can throw NPE
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1713471&r1=1713470&r2=1713471&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Nov 9 16:18:20 2015
@@ -233,6 +233,9 @@ Bug Fixes
* SOLR-8255: MiniSolrCloudCluster needs to use a thread-safe list to keep track
of its child nodes (Alan Woodward)
+* SOLR-8254: HttpSolrCore.getCoreByCollection() can throw NPE (Alan Woodward,
+ Mark Miller)
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java?rev=1713471&r1=1713470&r2=1713471&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java Mon Nov 9 16:18:20 2015
@@ -783,10 +783,8 @@ public class HttpSolrCall {
for (Map.Entry<String, Slice> entry : entries) {
// first see if we have the leader
Replica leaderProps = clusterState.getLeader(collection, entry.getKey());
- if (liveNodes.contains(leaderProps.getNodeName()) && leaderProps.getState() == Replica.State.ACTIVE) {
- if (leaderProps != null) {
- core = checkProps(leaderProps);
- }
+ if (leaderProps != null && liveNodes.contains(leaderProps.getNodeName()) && leaderProps.getState() == Replica.State.ACTIVE) {
+ core = checkProps(leaderProps);
if (core != null) {
return core;
}