* java/lang/ClassLoader.java (getSystemResource): Use

        getSystemClassLoader instead of ClassLoader.system.
        (getSystemResourceAsStream): Ditto.

        * java/lang/natClassLoader.cc (redirect): Make static and
        remove #ifdef INTERPRETER so it is always defined.
        (getVMClassLoader0): Remove #ifdef INTERPRETER so it always
        returns a VMClassLoader.

        * java/util/ResourceBundle.java (trySomeGetBundle): Create a
        PropertyResourceBundle if a properties file is found before a
        ResourceBundle class.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30048 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 2 deletions

diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java
index 4d520bb6c19..f04868d94e6 100644
--- a/libjava/java/lang/ClassLoader.java
+++ b/libjava/java/lang/ClassLoader.java
@@ -360,11 +360,11 @@ public abstract class ClassLoader {
   protected native Class findLoadedClass(String name);
 
   public static final InputStream getSystemResourceAsStream(String name) {
-    return system.getResourceAsStream (name);
+    return getSystemClassLoader().getResourceAsStream (name);
   }
 
   public static final URL getSystemResource(String name) {
-    return system.getResource (name);
+    return getSystemClassLoader().getResource (name);
   }
 
   /**