1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 4172a44..c0d06d4 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -144,8 +144,10 @@ _Jv_WaitForState (jclass klass, int state)
 
   if (state == JV_STATE_LINKED)
     {
-      _Jv_MonitorExit (klass);
+      // Must call _Jv_PrepareCompiledClass while holding the class
+      // mutex.
       _Jv_PrepareCompiledClass (klass);
+      _Jv_MonitorExit (klass);
       return;
     }
 	
@@ -217,7 +219,7 @@ _Jv_PrepareCompiledClass(jclass klass)
   if (klass->state >= JV_STATE_LINKED)
     return;
 
-  // short-circuit, so that mutually dependent classes are ok
+  // Short-circuit, so that mutually dependent classes are ok.
   klass->state = JV_STATE_LINKED;
 
   _Jv_Constants *pool = &klass->constants;