Fix implementation of ClassLoaderSupport.isNativeImageClassLoader

oracle · May 11, 2022 · 9ca9ba5 · 9ca9ba5
1 parent 1e55daf
commit 9ca9ba5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java
@@ -76,7 +76,23 @@ class ClassLoaderSupportImpl extends ClassLoaderSupport {
 
  @Override
  protected boolean isNativeImageClassLoaderImpl(ClassLoader loader) {
- return loader == imageClassLoader || loader instanceof NativeImageSystemClassLoader;
+ if (loader == imageClassLoader) {
+ /* Trivial case */
+ return true;
+ }
+ if (loader == classLoaderSupport.classPathClassLoader) {
+ /*
+ * If imageClassLoader is a module classloader (building image with non-empty
+ * NativeImageClassLoaderSupport.imagemp), the passed loader could also be our
+ * classLoaderSupport.classPathClassLoader (building image with non-empty
+ * NativeImageClassLoaderSupport.imagecp).
+ */
+ return true;
+ }
+ if (loader instanceof NativeImageSystemClassLoader) {
+ return true;
+ }
+ return false;
  }
 
  @Override

diff --git a/...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java b/...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
@@ -95,7 +95,7 @@ public class NativeImageClassLoaderSupport {
  private final EconomicMap<URI, EconomicSet<String>> packages;
  private final EconomicSet<String> emptySet;
 
- private final URLClassLoader classPathClassLoader;
+ final URLClassLoader classPathClassLoader;
  private final ClassLoader modulePathClassLoader;
 
  public final ModuleFinder upgradeAndSystemModuleFinder;