commit 5d905e7cee018cc22028eaa90cefef5506b96b43
author Ishan Chattopadhyaya <ishan@apache.org> Sat Sep 19 10:39:18 2020 +0530
committer Ishan Chattopadhyaya <ishan@apache.org> Sat Sep 19 10:39:18 2020 +0530
tree 095e9d135d8a834567ada39ba07ebc54ee04aa8a
parent b375a64a63eae285f64da985ff7872023e0e65fd

SOLR-14151: Fix coredescriptor change in last revert

solr/core/src/java/org/apache/solr/core/SolrCore.java

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 @@
 
     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();