From eb441a632df6204cde5b370e7cee434f0401e177 Mon Sep 17 00:00:00 2001
From: Andrey Bozhko <abozhko@apple.com>
Date: Tue, 21 May 2024 11:00:32 -0500
Subject: [PATCH] attempt to fix

---
 solr/core/src/java/org/apache/solr/core/SolrConfig.java    | 3 +++
 .../src/java/org/apache/solr/core/SolrResourceLoader.java  | 7 ++++++-
 2 files changed, 9 insertions(+), 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
index 7fb27347818..6113216af3d 100644
--- 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
index 898f2801304..2b1c80ff0a7 100644
--- 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;