Class.h: Move JV_STATE_ERROR before JV_STATE_DONE.

	* java/lang/Class.h: Move JV_STATE_ERROR before JV_STATE_DONE.
	* java/lang/natClass.cc (initializeClass): Don't return just
	because self==thread.

From-SVN: r58763

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4bb2f261a79216ecf4fd8c4d1e7937cfe2b77b1d..f78a70035081f2e473a092aba36c7e79b4427eab 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-02  Tom Tromey  <tromey@redhat.com>
 
+       * java/lang/Class.h: Move JV_STATE_ERROR before JV_STATE_DONE.
+       * java/lang/natClass.cc (initializeClass): Don't return just
+       because self==thread.
+
        For PR java/8415:
        * java/lang/reflect/natMethod.cc (getType): Use _Jv_FindClass.
        * prims.cc (_Jv_FindClassFromSignature): Indentation fix.

diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index 9a8d4183b6fc135351833a8d3592ea1e9098ab50..881fb77c44e93e7bf68df16b4f3582b82389fdd8 100644 (file)
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -46,9 +46,10 @@ enum
   JV_STATE_LINKED = 9,         // Strings interned.
 
   JV_STATE_IN_PROGRESS = 10,   // <Clinit> running.
-  JV_STATE_DONE = 12,          // 
 
-  JV_STATE_ERROR = 14          // must be last.
+  JV_STATE_ERROR = 12,
+
+  JV_STATE_DONE = 14           // Must be last.
 };
 
 struct _Jv_Field;

diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index fca074152cee414986984a1304b19e0f03fab1e0..9e86111156372b67316878ce6f262e1c106af685 100644 (file)
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -741,9 +741,7 @@ java::lang::Class::initializeClass (void)
     wait ();
 
   // Steps 3 &  4.
-  if (state == JV_STATE_DONE
-      || state == JV_STATE_IN_PROGRESS
-      || thread == self)
+  if (state == JV_STATE_DONE || state == JV_STATE_IN_PROGRESS)
     {
       _Jv_MonitorExit (this);
       return;