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

libjava/ChangeLog

 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.

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;

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;