[lucene-solr] branch jira/solr-14151-revert-2 updated: SOLR-14151: Fix coredescriptor change in last revert

[is...@apache.org]

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

ishan pushed a commit to branch jira/solr-14151-revert-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-14151-revert-2 by this push:
     new 5d905e7  SOLR-14151: Fix coredescriptor change in last revert
5d905e7 is described below

commit 5d905e7cee018cc22028eaa90cefef5506b96b43
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Sat Sep 19 10:39:18 2020 +0530

    SOLR-14151: Fix coredescriptor change in last revert
---
 solr/core/src/java/org/apache/solr/core/SolrCore.java | 9 ++++-----
 1 file changed, 4 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 a7b8a44..1058285 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -923,13 +923,12 @@ public final class SolrCore implements SolrInfoBean, Closeable {
 
     final CountDownLatch latch = new CountDownLatch(1);
     try {
+      this.coreContainer = coreContainer;
+      this.coreDescriptor = Objects.requireNonNull(coreDescriptor, "coreDescriptor cannot be null");
+      setName(coreDescriptor.getName());
+      
       IndexSchema schema = configSet.getIndexSchema();
 
-      CoreDescriptor cd = Objects.requireNonNull(coreDescriptor, "coreDescriptor cannot be null");
-      coreContainer.solrCores.addCoreDescriptor(cd);
-
-      setName(name);
-
       this.solrConfig = configSet.getSolrConfig();
       this.resourceLoader = configSet.getSolrConfig().getResourceLoader();
       this.configSetProperties = configSet.getProperties();