diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-11-02 23:52:56 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-11-02 23:52:56 +0000 |
| commit | afa54b4c0934c5a5c8a72b2ea15bd4adb00cf6bb (patch) | |
| tree | 5da239e27cd0409059d3803ba5140245445298c2 /libjava | |
| parent | 60b68525a59cd726ac29632ed4fbb1d6e1df1b0b (diff) | |
| download | gcc-afa54b4c0934c5a5c8a72b2ea15bd4adb00cf6bb.zip gcc-afa54b4c0934c5a5c8a72b2ea15bd4adb00cf6bb.tar.gz gcc-afa54b4c0934c5a5c8a72b2ea15bd4adb00cf6bb.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/lang/Class.h | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4bb2f26..f78a700 100644 --- 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 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, // <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 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; |