+2005-03-09 Tom Tromey <tromey@redhat.com>
+
+ * java/lang/natVMClassLoader.cc (defineClass): Reference
+ 'systemClassLoader' field directly.
+ * java/lang/natRuntime.cc (_load): Reference 'systemClassLoader'
+ field directly.
+ * java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader):
+ Reference 'systemClassLoader' field directly.
+ (_Jv_UnregisterInitiatingLoader): Likewise.
+ (_Jv_FindClass): Likewise.
+
2005-03-09 Andreas Tobler <a.tobler@schweiz.ch>
* java/lang/fdlibm.h: Merge an AIX define from GNU Classpath.
_Jv_RegisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader)
{
if (! loader)
- loader = java::lang::ClassLoader::getSystemClassLoader();
+ loader = java::lang::ClassLoader::systemClassLoader;
loader->loadedClasses->put(klass->name->toString(), klass);
}
_Jv_UnregisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader)
{
if (! loader)
- loader = java::lang::ClassLoader::getSystemClassLoader();
+ loader = java::lang::ClassLoader::systemClassLoader;
loader->loadedClasses->remove(klass->name->toString());
}
// See if the class was already loaded by this loader. This handles
// initiating loader checks, as we register classes with their
// initiating loaders.
- java::lang::ClassLoader *sys
- = java::lang::ClassLoader::getSystemClassLoader ();
+ java::lang::ClassLoader *sys = java::lang::ClassLoader::systemClassLoader;
java::lang::ClassLoader *real = loader;
if (! real)
real = sys;
if (do_search)
{
- ClassLoader *sys = ClassLoader::getSystemClassLoader();
+ ClassLoader *sys = ClassLoader::systemClassLoader;
ClassLoader *look = NULL;
gnu::gcj::runtime::StackTrace *t = new gnu::gcj::runtime::StackTrace(10);
try
// Record the defining loader. For the system class loader, we
// record NULL.
- if (loader != java::lang::ClassLoader::getSystemClassLoader())
+ if (loader != java::lang::ClassLoader::systemClassLoader)
klass->loader = loader;
if (name != 0)