Move extensionSettingsMap.put

Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · May 9, 2023 · 48264c2 · 48264c2
1 parent 140440d
commit 48264c2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
@@ -321,7 +321,6 @@ protected void discover() throws IOException {
                 throw new IOException("Could not read from extensions.yml", e);
             }
             for (Extension extension : extensions) {
-                extensionSettingsMap.put(extension.getUniqueId(), extension);
                 loadExtension(extension);
             }
             if (!extensionIdMap.isEmpty()) {
@@ -351,6 +350,7 @@ private void loadExtension(Extension extension) throws IOException {
                     extension.getDependencies()
                 );
                 extensionIdMap.put(extension.getUniqueId(), discoveryExtensionNode);
+                extensionSettingsMap.put(extension.getUniqueId(), extension);
                 logger.info("Loaded extension with uniqueId " + extension.getUniqueId() + ": " + extension);
             } catch (OpenSearchException e) {
                 logger.error("Could not load extension with uniqueId " + extension.getUniqueId() + " due to " + e);