Allow plugin classloader to define a parent classloader

Required to support a change in the launcher that will allow us to bypass outdated bundled FX artifacts in JDK distros
Col-E · Nov 24, 2024 · 5c4fa52 · 5c4fa52
1 parent 4e8f402
commit 5c4fa52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java
@@ -18,7 +18,8 @@ final class PluginClassLoaderImpl extends ClassLoader implements PluginClassLoad
 	private final PluginSource source;
 	private final String id;
 
-	PluginClassLoaderImpl(@Nonnull PluginGraph graph, @Nonnull PluginSource source, @Nonnull String id) {
+	PluginClassLoaderImpl(@Nonnull ClassLoader classLoader, @Nonnull PluginGraph graph, @Nonnull PluginSource source, @Nonnull String id) {
+		super(classLoader);
 		this.graph = graph;
 		this.source = source;
 		this.id = id;

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginGraph.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginGraph.java
@@ -46,7 +46,9 @@ Collection<PluginContainer<?>> apply(@Nonnull List<PreparedPlugin> preparedPlugi
 			if (plugins.containsKey(id)) {
 				throw new PluginException("Plugin %s is already loaded".formatted(id));
 			}
-			var classLoader = new PluginClassLoaderImpl(this, preparedPlugin.pluginSource(), id);
+			var threadContextClassLoader = Thread.currentThread().getContextClassLoader();
+			var parentLoader = threadContextClassLoader != null ? threadContextClassLoader : ClassLoader.getSystemClassLoader();
+			var classLoader = new PluginClassLoaderImpl(parentLoader, this, preparedPlugin.pluginSource(), id);
 			LoadedPlugin loadedPlugin = new LoadedPlugin(new PluginContainerImpl<>(preparedPlugin, classLoader));
 
 			if (temp.putIfAbsent(id, loadedPlugin) != null) {