diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 10 | ||||
| -rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index fb3515b..43016bf 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -107,6 +107,10 @@ _Jv_FindClassInCache (_Jv_Utf8Const *name) void _Jv_UnregisterClass (jclass the_class) { + // This can happen if the class could not be defined properly. + if (! the_class->name) + return; + JvSynchronize sync (&java::lang::Class::class$); jint hash = HASH_UTF(the_class->name); @@ -328,12 +332,6 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader) } } } - else - { - // We need classes to be in the hash while we're loading, so - // that they can refer to themselves. - _Jv_Linker::wait_for_state (klass, JV_STATE_LOADED); - } return klass; } 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(). |