attempt to fix

apache · May 21, 2024 · eb441a6 · eb441a6
1 parent 2ea89a4
commit eb441a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -390,6 +390,9 @@ private SolrConfig(
 
       solrRequestParsers = new SolrRequestParsers(this);
       log.debug("Loaded SolrConfig: {}", name);
+
+      // make resource loader aware of the config early on
+      this.resourceLoader.initConfig(this);
     } finally {
       ConfigNode.SUBSTITUTES.remove();
     }

diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
@@ -694,9 +694,14 @@ public <T> boolean addToCoreAware(T obj) {
     }
   }
 
+  void initConfig(SolrConfig config) {
+    assert this.config == null || this.config == config;
+    this.config = config;
+  }
+
   void initCore(SolrCore core) {
+    initConfig(core.getSolrConfig());
     this.coreName = core.getName();
-    this.config = core.getSolrConfig();
     this.coreId = core.uniqueId;
     this.coreContainer = core.getCoreContainer();
     SolrCore.Provider coreProvider = core.coreProvider;