From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 22 Apr 2005 02:33:31 +0000 (+0000)
Subject: 	* java/lang/natClass.cc (initializeClass): Link class.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dd553338562a8a36301ac65f3267a24923d5ace;p=thirdparty%2Fgcc.git

	* java/lang/natClass.cc (initializeClass): Link class.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98540 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 311eba729665..571264469b12 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index b93694790bb0..e29ed6809ef3 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();