diff options
author | Matt Benson <mbenson@apache.org> | 2022-02-13 14:37:53 -0600 |
---|---|---|
committer | Matt Benson <mbenson@apache.org> | 2022-02-13 14:37:53 -0600 |
commit | ce494e8365658f76b2648f5d0ccfd6753c880249 (patch) | |
tree | faa291fce1699a1975e87612af6d4228d31b21fb | |
parent | 945fd2520f4cd59b07996fef6bb8e46c2a8f2bc2 (diff) | |
download | ant-ce494e8365658f76b2648f5d0ccfd6753c880249.tar.gz |
use coreLoader, if set, to create subordinate classLoaders
-rw-r--r-- | src/main/org/apache/tools/ant/Project.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 5b20ca0c2..2cd2ba9c5 100644 --- 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.HashMap; 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 @@ public class Project implements ResourceFactory { * @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 class Project implements ResourceFactory { * * @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); } |