Make ExtendedGroovyClassLoader compatible with Java 9

Closes gh-10445
This commit is contained in:
Andy Wilkinson
2017-09-28 17:38:05 +01:00
parent bec2e97b95
commit ebf3b47305
2 changed files with 12 additions and 3 deletions

View File

@@ -175,7 +175,8 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
DefaultScopeParentClassLoader(ClassLoader parent) {
super(parent);
this.groovyOnlyClassLoader = new URLClassLoader(getGroovyJars(parent), null);
this.groovyOnlyClassLoader = new URLClassLoader(getGroovyJars(parent),
parent.getParent());
}
private URL[] getGroovyJars(final ClassLoader parent) {
@@ -232,7 +233,9 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
@Override
protected Class<?> loadClass(String name, boolean resolve)
throws ClassNotFoundException {
this.groovyOnlyClassLoader.loadClass(name);
if (!name.startsWith("java.")) {
this.groovyOnlyClassLoader.loadClass(name);
}
return super.loadClass(name, resolve);
}