Load extensions for classpath plugins

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Dec 14, 2024 · 44a4042 · 44a4042
1 parent 9b3f406
commit 44a4042
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/plugins/PluginsService.java b/server/src/main/java/org/opensearch/plugins/PluginsService.java
@@ -150,7 +150,7 @@ public PluginsService(
                 "1.8",
                 pluginClass.getName(),
                 null,
-                Collections.emptyList(),
+                classpathPlugins.stream().map(Class::getName).filter(cp -> !pluginClass.getName().equals(cp)).collect(Collectors.toList()),
                 false
             );
             if (logger.isTraceEnabled()) {
@@ -159,6 +159,7 @@ public PluginsService(
             pluginsLoaded.add(new Tuple<>(pluginInfo, plugin));
             pluginsList.add(pluginInfo);
             pluginsNames.add(pluginInfo.getName());
+            loadExtensions(pluginsLoaded);
         }
 
         Set<Bundle> seenBundles = new LinkedHashSet<>();