diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 311eba7..5712644 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,9 @@ 2005-04-21 Tom Tromey <tromey@redhat.com> + * java/lang/natClass.cc (initializeClass): Link class. + +2005-04-21 Tom Tromey <tromey@redhat.com> + * java/lang/AssertionError.java: Typo fix. 2005-04-21 Tom Tromey <tromey@redhat.com> diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index b936947..e29ed68 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -703,7 +703,20 @@ java::lang::Class::initializeClass (void) JvSynchronize sync (this); if (state < JV_STATE_LINKED) - java::lang::VMClassLoader::resolveClass (this); + { + try + { + _Jv_Linker::wait_for_state(this, JV_STATE_LINKED); + } + catch (java::lang::Throwable *x) + { + // Turn into a NoClassDefFoundError. + java::lang::NoClassDefFoundError *result + = new java::lang::NoClassDefFoundError(getName()); + result->initCause(x); + throw result; + } + } // Step 2. java::lang::Thread *self = java::lang::Thread::currentThread(); |