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
This commit is contained in:
Per Bothner 2001-08-31 18:17:24 -07:00 committed by Per Bothner
parent 788d7b942c
commit 8635bb79f2
4 changed files with 18 additions and 13 deletions

View file

@ -481,12 +481,8 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
}
else
{
java::lang::ClassLoader *sys = java::lang::ClassLoader::system;
if (sys == NULL)
{
_Jv_InitClass (&ClassLoaderClass);
sys = java::lang::ClassLoader::getSystemClassLoader ();
}
java::lang::ClassLoader *sys
= java::lang::ClassLoader::getSystemClassLoader ();
// Load using the bootstrap loader jvmspec 5.3.1.
klass = sys->loadClass (sname, false);