use coreLoader, if set, to create subordinate classLoaders

apache · Feb 13, 2022 · ce494e8 · ce494e8
1 parent 945fd25
commit ce494e8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
@@ -29,6 +29,7 @@
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.Stack;
@@ -339,8 +340,8 @@ private void setAntLib() {
      * @return an appropriate classloader.
      */
     public AntClassLoader createClassLoader(final Path path) {
-        return AntClassLoader
-            .newAntClassLoader(getClass().getClassLoader(), this, path, true);
+        return createClassLoader(
+            Optional.ofNullable(getCoreLoader()).orElse(getClass().getClassLoader()), path);
     }
 
     /**
@@ -352,8 +353,7 @@ public AntClassLoader createClassLoader(final Path path) {
      *
      * @return an appropriate classloader.
      */
-    public AntClassLoader createClassLoader(
-        final ClassLoader parent, final Path path) {
+    public AntClassLoader createClassLoader(final ClassLoader parent, final Path path) {
         return AntClassLoader.newAntClassLoader(parent, this, path, true);
     }