diff options
| author | Per Bothner <per@bothner.com> | 2001-08-31 18:17:24 -0700 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2001-08-31 18:17:24 -0700 |
| commit | 8635bb79f219f8d11e47b8403e54c5111712176b (patch) | |
| tree | da556e77ce7081d073287d3c5c1ebb687c46fb49 /libjava/prims.cc | |
| parent | 788d7b942c6621c06f3d9f362aaa179dcd8fc811 (diff) | |
| download | gcc-8635bb79f219f8d11e47b8403e54c5111712176b.zip gcc-8635bb79f219f8d11e47b8403e54c5111712176b.tar.gz gcc-8635bb79f219f8d11e47b8403e54c5111712176b.tar.bz2 | |
ClassLoader.java (system): Remove static field.
* 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.
From-SVN: r45343
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 01c23b8..6a13ed5 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) |