#3077: Fix regression preventing child classloaders delegating to a PluginClassloader

Bug was introduced in 425dd45109
This commit is contained in:
Luck 2021-05-01 08:32:51 +10:00 committed by md_5
parent 71d1246374
commit 72b3bdf676
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11

View File

@ -54,16 +54,16 @@ final class PluginClassloader extends URLClassLoader
} }
@Override @Override
public Class<?> loadClass(String name) throws ClassNotFoundException protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException
{ {
return loadClass0( name, true, true ); return loadClass0( name, resolve, true, true );
} }
private Class<?> loadClass0(String name, boolean checkOther, boolean checkLibraries) throws ClassNotFoundException private Class<?> loadClass0(String name, boolean resolve, boolean checkOther, boolean checkLibraries) throws ClassNotFoundException
{ {
try try
{ {
return super.loadClass( name ); return super.loadClass( name, resolve );
} catch ( ClassNotFoundException ex ) } catch ( ClassNotFoundException ex )
{ {
} }
@ -86,7 +86,7 @@ final class PluginClassloader extends URLClassLoader
{ {
try try
{ {
return loader.loadClass0( name, false, proxy.getPluginManager().isTransitiveDepend( desc, loader.desc ) ); return loader.loadClass0( name, resolve, false, proxy.getPluginManager().isTransitiveDepend( desc, loader.desc ) );
} catch ( ClassNotFoundException ex ) } catch ( ClassNotFoundException ex )
{ {
} }