diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-06-24 22:48:33 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-06-24 22:48:33 +0000 |
| commit | 42c5169549014e6f1b8be662d04b6530a4298c95 (patch) | |
| tree | de416528940c92c7487c2e3625d257a047026d0d /libjava/java/lang/natVMClassLoader.cc | |
| parent | b7938f087dc0934e674e7cf7f6049145bd1a345d (diff) | |
| download | gcc-42c5169549014e6f1b8be662d04b6530a4298c95.zip gcc-42c5169549014e6f1b8be662d04b6530a4298c95.tar.gz gcc-42c5169549014e6f1b8be662d04b6530a4298c95.tar.bz2 | |
natClassLoader.cc (_Jv_UnregisterClass): Handle case where class' name is NULL.
* java/lang/natClassLoader.cc (_Jv_UnregisterClass): Handle case
where class' name is NULL.
(_Jv_FindClass): Don't wait for class state.
* java/lang/natVMClassLoader.cc (defineClass): Only unregister if
name found.
* include/java-interp.h (_Jv_DefineClass): Updated.
* defineclass.cc (_Jv_DefineClass): Added 'name_result' argument.
(struct _Jv_ClassReader): Likewise.
(found_name): New field.
(handleClassBegin): Set *found_name.
(_Jv_VerifyMethodSignature): Handle case where ptr==NULL.
(handleClassBegin): Throw error if super class not set.
(read_methods): Correctly call check_tag and prepare_pool_entry.
From-SVN: r101301
Diffstat (limited to 'libjava/java/lang/natVMClassLoader.cc')
| -rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index 2e7b90d..bffbfc0 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -71,16 +71,18 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader, klass->name = name2; } + _Jv_Utf8Const *found_name = NULL; try { - _Jv_DefineClass (klass, data, offset, length, pd); + _Jv_DefineClass (klass, data, offset, length, pd, &found_name); } catch (java::lang::Throwable *ex) { klass->state = JV_STATE_ERROR; klass->notifyAll (); - _Jv_UnregisterInitiatingLoader (klass, klass->loader); + if (found_name != NULL) + _Jv_UnregisterInitiatingLoader (klass, klass->loader); // If EX is not a ClassNotFoundException, that's ok, because we // account for the possibility in defineClass(). |