diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-04-20 05:49:48 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-04-20 05:49:48 +0000 |
| commit | a46e3486f1258214a5056e82a9c859146e31d172 (patch) | |
| tree | 28cabe5367d6c64b2d9309b330e806b228ed8eb7 /libjava | |
| parent | 0679c128108e89f90172c6283d313648bf74396b (diff) | |
| download | ppe42-gcc-a46e3486f1258214a5056e82a9c859146e31d172.tar.gz ppe42-gcc-a46e3486f1258214a5056e82a9c859146e31d172.zip | |
* jni.cc (_Jv_JNI_FindClass): Use system class loader if class
doesn't have a loader.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33272 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/jni.cc | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a4dfbd26dba..f5806da6bba 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2000-04-19 Tom Tromey <tromey@cygnus.com> + + * jni.cc (_Jv_JNI_FindClass): Use system class loader if class + doesn't have a loader. + 2000-04-19 Bryce McKinlay <bryce@albatross.co.nz> * boehm.cc: (_Jv_MarkObj, _Jv_MarkArray): Cast pointers for diff --git a/libjava/jni.cc b/libjava/jni.cc index ea2f03974f3..cd45ab8feb2 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -424,15 +424,16 @@ _Jv_JNI_FindClass (JNIEnv *env, const char *name) // This might throw an out of memory exception. jstring n = JvNewStringUTF (s); - java::lang::ClassLoader *loader; - if (env->klass == NULL) + java::lang::ClassLoader *loader = NULL; + if (env->klass != NULL) + loader = env->klass->getClassLoader (); + + if (loader == NULL) { // FIXME: should use getBaseClassLoader, but we don't have that // yet. loader = java::lang::ClassLoader::getSystemClassLoader (); } - else - loader = env->klass->getClassLoader (); r = loader->loadClass (n); } |
