Always load java.* classes by delegating to the bootstrap class loader

Fixes #34 for real
luontola · Oct 3, 2014 · 6f1891b · 6f1891b
1 parent 281ef93
commit 6f1891b
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 30 deletions.
diff --git a/.idea/libraries/Maven__net_orfjackal_retrolambda_java_lang_dummies_1.xml b/.idea/libraries/Maven__net_orfjackal_retrolambda_java_lang_dummies_1.xml
diff --git a/end-to-end-tests/end-to-end-tests.iml b/end-to-end-tests/end-to-end-tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: net.orfjackal.retrolambda:java-lang-dummies:1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />

diff --git a/end-to-end-tests/pom.xml b/end-to-end-tests/pom.xml
@@ -28,6 +28,15 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- See net.orfjackal.retrolambda.test.ClasspathTest#ignores_classes_in_explicit_classpath_that_are_under_the_java_package -->
+        <dependency>
+            <groupId>net.orfjackal.retrolambda</groupId>
+            <artifactId>java-lang-dummies</artifactId>
+            <version>1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/test/lib/java-lang-dummies.jar</systemPath>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/end-to-end-tests/src/test/java/java/lang/Math.java b/end-to-end-tests/src/test/java/java/lang/Math.java
diff --git a/end-to-end-tests/src/test/java/net/orfjackal/retrolambda/test/ClasspathTest.java b/end-to-end-tests/src/test/java/net/orfjackal/retrolambda/test/ClasspathTest.java
@@ -7,10 +7,12 @@
 import org.hamcrest.*;
 import org.junit.Test;
 
-import java.util.Arrays;
+import java.io.IOException;
+import java.net.URL;
+import java.util.*;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertNotNull;
 
 public class ClasspathTest {
@@ -65,7 +67,11 @@ public void prefers_classes_in_explicit_classpath_over_classes_in_the_JRE() {
      * contains {@code java.*} classes.
      */
     @Test
-    public void ignores_classes_in_explicit_classpath_that_are_under_the_java_package() {
-        assertNotNull(getClass().getResource("/java/lang/Math.class"));
+    public void ignores_classes_in_explicit_classpath_that_are_under_the_java_package() throws IOException {
+        // We have a JAR on the classpath that contains dummy version of java.lang.Object,
+        // the same way as android.jar, which causes Retrolambda to try loading that class
+        // because the classes to be backported extend it implicitly.
+        List<URL> resources = Collections.list(getClass().getClassLoader().getResources("java/lang/Object.class"));
+        assertThat(resources, (Matcher) hasItem(hasToString(containsString("java-lang-dummies.jar"))));
     }
 }
diff --git a/end-to-end-tests/src/test/lib/java-lang-dummies.jar b/end-to-end-tests/src/test/lib/java-lang-dummies.jar
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/NonDelegatingClassLoader.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/NonDelegatingClassLoader.java
@@ -14,6 +14,9 @@ public NonDelegatingClassLoader(URL[] urls) {
 
     @Override
     public Class<?> loadClass(String name) throws ClassNotFoundException {
+        if (name.startsWith("java.")) { // the java.* classes can only be loaded by the bootstrap class loader
+            return super.loadClass(name);
+        }
         Class<?> c = findLoadedClass(name);
         if (c != null) {
             return c;

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/interfaces/ClassHierarchyAnalyzer.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/interfaces/ClassHierarchyAnalyzer.java
@@ -23,12 +23,7 @@ public class ClassHierarchyAnalyzer implements MethodRelocations {
 
     public void analyze(byte[] bytecode) {
         ClassReader cr = new ClassReader(bytecode);
-        String className = cr.getClassName();
-        if (className.startsWith("java/")) {
-            // the JVM disallows user classes in java.* packages, so don't even try backporting them
-            return;
-        }
-        Type clazz = classNameToType(className);
+        Type clazz = classNameToType(cr.getClassName());
 
         if (Flags.hasFlag(cr.getAccess(), ACC_INTERFACE)) {
             interfaces.add(cr);