diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-03-09 20:58:17 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-03-09 20:58:17 +0000 |
| commit | b7a29fa9f24e6023bc214f00ca72ea35e459c5f7 (patch) | |
| tree | ef2d0f788fbc08bffe034dcb2415e86447953d3b /libjava/java | |
| parent | 9b868aff56969e53d2c359b5d54038ce952e7ac8 (diff) | |
| download | gcc-b7a29fa9f24e6023bc214f00ca72ea35e459c5f7.zip gcc-b7a29fa9f24e6023bc214f00ca72ea35e459c5f7.tar.gz gcc-b7a29fa9f24e6023bc214f00ca72ea35e459c5f7.tar.bz2 | |
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
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 7 | ||||
| -rw-r--r-- | libjava/java/lang/natRuntime.cc | 2 | ||||
| -rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 17b2a88..dfb976a 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -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; diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index 31f9b90..97a69b2 100644 --- a/libjava/java/lang/natRuntime.cc +++ b/libjava/java/lang/natRuntime.cc @@ -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 diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index 1da7949..9a539d7 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -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) |