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

From-SVN: r98540
2005-04-22 02:33:31 +00:00
parent 88ab7d19e4
commit 36a0d3d264
2 changed files with 18 additions and 1 deletions
@@ -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();