From 683071b1a4dc618cd622d2d65161d0dfef3a4d8c Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 30 Jan 2017 15:22:02 +0100 Subject: [PATCH] revert groovyc JointCompilationClassLoader changes as they don't fix IDEA-166169 --- .../incremental/groovy/JointCompilationClassLoader.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JointCompilationClassLoader.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JointCompilationClassLoader.java index 8abb9cf5253f..f40f2586b117 100644 --- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JointCompilationClassLoader.java +++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JointCompilationClassLoader.java @@ -15,7 +15,6 @@ */ package org.jetbrains.jps.incremental.groovy; -import com.intellij.util.SystemProperties; import com.intellij.util.lang.ClassPath; import com.intellij.util.lang.UrlClassLoader; import org.jetbrains.annotations.NotNull; @@ -24,7 +23,6 @@ import org.jetbrains.annotations.NotNull; * @author peter */ class JointCompilationClassLoader extends UrlClassLoader { - private static final boolean ourExplicitlyAvoidLoadingJava = SystemProperties.getBooleanProperty("groovy.classloader.skip.java.package", true); @NotNull private final Builder myBuilder; @NotNull private ClassPath myClassPath; @@ -34,13 +32,6 @@ class JointCompilationClassLoader extends UrlClassLoader { myClassPath = super.getClassPath(); } - @Override - protected Class findClass(String name) throws ClassNotFoundException { - if (ourExplicitlyAvoidLoadingJava && name.startsWith("java.")) return null; - - return super.findClass(name); - } - @Override protected Class _defineClass(String name, byte[] b) { try {