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 2014/10/21 08:11:08 UTC
svn commit: r1633277 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
Author: shalin
Date: Tue Oct 21 06:11:08 2014
New Revision: 1633277
URL: http://svn.apache.org/r1633277
Log:
SOLR-6530: Protect against NPE when there are no live replicas
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/update/processor/DistributedUpdateProcessor.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1633277&r1=1633276&r2=1633277&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Tue Oct 21 06:11:08 2014
@@ -850,10 +850,12 @@ public class DistributedUpdateProcessor
List<ZkCoreNodeProps> myReplicas = zkController.getZkStateReader().getReplicaProps(collection,
cloudDesc.getShardId(), cloudDesc.getCoreNodeName());
boolean foundErrorNodeInReplicaList = false;
- for (ZkCoreNodeProps replicaProp : myReplicas) {
- if (((Replica) replicaProp.getNodeProps()).getName().equals(((Replica)stdNode.getNodeProps().getNodeProps()).getName())) {
- foundErrorNodeInReplicaList = true;
- break;
+ if (myReplicas != null) {
+ for (ZkCoreNodeProps replicaProp : myReplicas) {
+ if (((Replica) replicaProp.getNodeProps()).getName().equals(((Replica)stdNode.getNodeProps().getNodeProps()).getName())) {
+ foundErrorNodeInReplicaList = true;
+ break;
+ }
}
}