From afa54b4c0934c5a5c8a72b2ea15bd4adb00cf6bb Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 2 Nov 2002 23:52:56 +0000 Subject: 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/java/lang/Class.h | 5 +++-- libjava/java/lang/natClass.cc | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 9a8d418..881fb77 100644 --- 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, // 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 fca0741..9e86111 100644 --- 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; -- cgit v1.1