diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-02 23:52:56 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-02 23:52:56 +0000 |
| commit | 9a31008ed732054001a9f6c00d310e48598bf8ad (patch) | |
| tree | 5da239e27cd0409059d3803ba5140245445298c2 /libjava/java | |
| parent | 3e204b370a2de22b7efe63a09d7c41fdb293dac7 (diff) | |
| download | ppe42-gcc-9a31008ed732054001a9f6c00d310e48598bf8ad.tar.gz ppe42-gcc-9a31008ed732054001a9f6c00d310e48598bf8ad.zip | |
* java/lang/Class.h: Move JV_STATE_ERROR before JV_STATE_DONE.
* java/lang/natClass.cc (initializeClass): Don't return just
because self==thread.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58763 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Class.h | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 9a8d4183b6f..881fb77c44e 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 fca074152ce..9e861111563 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; |
