diff options
| author | Anthony Green <green@cygnus.com> | 1999-10-17 03:11:50 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 1999-10-17 03:11:50 +0000 |
| commit | 6c413a50e664e75c77f94aa1f441c1f876084140 (patch) | |
| tree | c92648414fd189d79211213f4fc2b16e607c106c /libjava/java/lang/natClassLoader.cc | |
| parent | 1b284f05acb025d025040466a23f9ca72548d7e7 (diff) | |
| download | gcc-6c413a50e664e75c77f94aa1f441c1f876084140.zip gcc-6c413a50e664e75c77f94aa1f441c1f876084140.tar.gz gcc-6c413a50e664e75c77f94aa1f441c1f876084140.tar.bz2 | |
ClassLoader.java (getSystemResource): Use getSystemClassLoader instead of ClassLoader.system.
* 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.
From-SVN: r30048
Diffstat (limited to 'libjava/java/lang/natClassLoader.cc')
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 9ad81a8..af4a4fa 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -48,20 +48,14 @@ extern java::lang::Class ClassLoaderClass; /////////// java.lang.ClassLoader native methods //////////// -#ifdef INTERPRETER -gnu::gcj::runtime::VMClassLoader *redirect = 0; -#endif +static gnu::gcj::runtime::VMClassLoader *redirect = 0; java::lang::ClassLoader* java::lang::ClassLoader::getVMClassLoader0 () { -#ifdef INTERPRETER - if (redirect == 0) - redirect = new gnu::gcj::runtime::VMClassLoader; - return redirect; -#else - return 0; -#endif + if (redirect == 0) + redirect = new gnu::gcj::runtime::VMClassLoader; + return redirect; } void |