diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-09-01 01:17:24 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-09-01 01:17:24 +0000 |
| commit | 863ecb9bf814e4b75f362c0898a2743a16d6c1d6 (patch) | |
| tree | da556e77ce7081d073287d3c5c1ebb687c46fb49 /libjava/prims.cc | |
| parent | e3336840c69422a210c249d994a5a232ce29ee87 (diff) | |
| download | gcc-863ecb9bf814e4b75f362c0898a2743a16d6c1d6.tar.gz | |
* java/lang/ClassLoader.java (system): Remove static field.
(getSystemClassLoader): Get gnu.gcj.runtime.VMClassLoader.instance
directly instead of using it to set the system field.
(loadClass): Use VMClassLoader.instance instead of system field.
(findSystemClass): Similar.
* prims.cc (_Jv_RunMain): Clear VMClassLoader::instance rather
than ClassLoader::system which no longer exists.
* java/lang/natClassLoader.java (_Jv_FindClass): Simplify.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45343 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index 01c23b89820..6a13ed5fe75 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -64,6 +64,7 @@ details. */ #include <java/lang/reflect/Modifier.h> #include <java/io/PrintStream.h> #include <java/lang/UnsatisfiedLinkError.h> +#include <gnu/gcj/runtime/VMClassLoader.h> #ifdef USE_LTDL #include <ltdl.h> @@ -921,7 +922,7 @@ _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv, // jar file only. The easiest way to do this is to lose our // reference to the previous classloader. _Jv_Jar_Class_Path = strdup (name); - java::lang::ClassLoader::system = NULL; + gnu::gcj::runtime::VMClassLoader::instance = NULL; } } catch (java::lang::Throwable *t) |