You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/09/02 18:11:59 UTC

[lucene-solr] 02/11: @704 Handle rare case.

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

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

commit 0477045e5ee53301592b0851b099c7ee0690a631
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Sep 2 09:13:06 2020 -0500

    @704 Handle rare case.
---
 solr/core/src/java/org/apache/solr/core/SolrCore.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 9962b96..cee80a0 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1157,11 +1157,13 @@ public final class SolrCore implements SolrInfoBean, Closeable {
 
 
       final DocCollection collection = clusterState.getCollectionOrNull(coreDescriptor.getCloudDescriptor().getCollectionName());
-      final Slice slice = collection.getSlice(coreDescriptor.getCloudDescriptor().getShardId());
-      if (slice.getState() == Slice.State.CONSTRUCTION) {
-        // set update log to buffer before publishing the core
-        assert getUpdateHandler().getUpdateLog() != null;
-        getUpdateHandler().getUpdateLog().bufferUpdates();
+      if (collection != null) {
+        final Slice slice = collection.getSlice(coreDescriptor.getCloudDescriptor().getShardId());
+        if (slice.getState() == Slice.State.CONSTRUCTION) {
+          // set update log to buffer before publishing the core
+          assert getUpdateHandler().getUpdateLog() != null;
+          getUpdateHandler().getUpdateLog().bufferUpdates();
+        }
       }
     }
   }