OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natVMClassLoader.cc (defineClass): Reference 'systemClassLoader' field directly. 

* 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.

From-SVN: r96208
This commit is contained in:
Tom Tromey 2005-03-09 20:58:17 +00:00 committed by Tom Tromey
parent 9b868aff56
commit b7a29fa9f2
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libjava/ChangeLog
View File

@ -1,3 +1,14 @@
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.

7
libjava/java/lang/natClassLoader.cc
View File

@ -106,7 +106,7 @@ void
_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);
}
@ -116,7 +116,7 @@ void
_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());
}
@ -211,8 +211,7 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
// 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;

2
libjava/java/lang/natRuntime.cc
View File

@ -163,7 +163,7 @@ java::lang::Runtime::_load (jstring path, jboolean do_search)
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

2
libjava/java/lang/natVMClassLoader.cc
View File

@ -68,7 +68,7 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader,
// 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)