Removed map.xml patching of bootstrap resource loading methods in java.lang.ClassLoader.

2 files changed, 3 insertions, 29 deletions

diff --git a/openjdk/java/lang/ClassLoader.java b/openjdk/java/lang/ClassLoader.java
index 96cc432e..3477666b 100644
--- a/openjdk/java/lang/ClassLoader.java
+++ b/openjdk/java/lang/ClassLoader.java
@@ -1326,29 +1326,13 @@ public abstract class ClassLoader {
     /**
      * Find resources from the VM's built-in classloader.
      */
-    private static URL getBootstrapResource(String name) {
-        URLClassPath ucp = getBootstrapClassPath();
-        Resource res = ucp.getResource(name);
-        return res != null ? res.getURL() : null;
-    }
+    private static native URL getBootstrapResource(String name);
 
     /**
      * Find resources from the VM's built-in classloader.
      */
-    private static Enumeration<URL> getBootstrapResources(String name)
-        throws IOException
-    {
-        final Enumeration<Resource> e =
-            getBootstrapClassPath().getResources(name);
-        return new Enumeration<URL> () {
-            public URL nextElement() {
-                return e.nextElement().getURL();
-            }
-            public boolean hasMoreElements() {
-                return e.hasMoreElements();
-            }
-        };
-    }
+    private static native Enumeration<URL> getBootstrapResources(String name)
+        throws IOException;
 
     // Returns the URLClassPath that is used for finding system resources.
     static URLClassPath getBootstrapClassPath() {
diff --git a/openjdk/java/lang/LangHelper.java b/openjdk/java/lang/LangHelper.java
index 93134920..f4fc99ff 100644
--- a/openjdk/java/lang/LangHelper.java
+++ b/openjdk/java/lang/LangHelper.java
@@ -89,16 +89,6 @@ public class LangHelper
         return ikvm.runtime.Util.getInstanceTypeFromClass(Object.class).get_Assembly();
     }
 
-    static URL getBootstrapResource(String name)
-    {
-        return AssemblyClassLoader.getResource(getBootstrapAssembly(), name);
-    }
-
-    static Enumeration getBootstrapResources(String name) throws IOException
-    {
-        return AssemblyClassLoader.getResources(getBootstrapAssembly(), name);
-    }
-    
     public static sun.misc.JavaLangAccess getJavaLangAccess()
     {
         return new sun.misc.JavaLangAccess() {