Single call to loadExtensions

Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Jan 21, 2025 · a4937bd · a4937bd
1 parent df48c29
commit a4937bd
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/plugins/PluginsService.java b/server/src/main/java/org/opensearch/plugins/PluginsService.java
@@ -192,7 +192,6 @@ public PluginsService(
                 logger.error("Failed to load classpath plugin: " + pluginInfo.getClassname());
             }
         }
-        loadExtensions(pluginsLoaded);
 
         Set<Bundle> seenBundles = new LinkedHashSet<>();
         List<PluginInfo> modulesList = new ArrayList<>();
@@ -229,6 +228,7 @@ public PluginsService(
 
         List<Tuple<PluginInfo, Plugin>> loaded = loadBundles(seenBundles);
         pluginsLoaded.addAll(loaded);
+        loadExtensions(pluginsLoaded);
 
         this.info = new PluginsAndModules(pluginsList, modulesList);
         this.plugins = Collections.unmodifiableList(pluginsLoaded);
@@ -585,7 +585,6 @@ private List<Tuple<PluginInfo, Plugin>> loadBundles(Set<Bundle> bundles) {
             plugins.add(new Tuple<>(bundle.plugin, plugin));
         }
 
-        loadExtensions(plugins);
         return Collections.unmodifiableList(plugins);
     }