From 4dd553338562a8a36301ac65f3267a24923d5ace Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 22 Apr 2005 02:33:31 +0000 Subject: * java/lang/natClass.cc (initializeClass): Link class. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98540 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/natClass.cc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index b93694790bb..e29ed6809ef 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(); -- cgit v1.2.3