Browse Source

use coreLoader, if set, to create subordinate classLoaders

master
Matt Benson 3 years ago
parent
commit
ce494e8365
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      src/main/org/apache/tools/ant/Project.java

+ 4
- 4
src/main/org/apache/tools/ant/Project.java View File

@@ -29,6 +29,7 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.Stack; import java.util.Stack;
@@ -339,8 +340,8 @@ public class Project implements ResourceFactory {
* @return an appropriate classloader. * @return an appropriate classloader.
*/ */
public AntClassLoader createClassLoader(final Path path) { 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. * @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); return AntClassLoader.newAntClassLoader(parent, this, path, true);
} }




Loading…
Cancel
Save