[lucene-solr] branch reference_impl_dev updated: @820 Avoid NPE.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 1084bf1  @820 Avoid NPE.
1084bf1 is described below

commit 1084bf15d79b4e5038657797ead849e97b405e03
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Sep 9 09:24:05 2020 -0500

    @820 Avoid NPE.
---
 solr/core/src/java/org/apache/solr/cloud/Overseer.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 4b713a2..320cc42 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -451,9 +451,12 @@ public class Overseer implements SolrCloseable {
         }
 
         for (Slice slice : slicesMap.values()) {
-          Slice oldSlice = oldDoc.getSlicesMap().get(slice.getName());
+          Slice oldSlice = null;
+          if (oldDoc.getSlicesMap() != null) {
+            oldSlice = oldDoc.getSlicesMap().get(slice.getName());
+          }
           Map<String,Replica> existingReplicas;
-          if (oldSlice != null) {
+          if (oldSlice != null && oldSlice.getReplicasMap() != null) {
             existingReplicas = new HashMap<>(oldSlice.getReplicasMap());
           } else {
             existingReplicas = new HashMap<>();