FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Class.h: Move JV_STATE_ERROR before JV_STATE_DONE.

Browse source 
* 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
This commit is contained in:
Tom Tromey 2002-11-02 23:52:56 +00:00 • committed by Tom Tromey
parent 60b68525a5
commit afa54b4c09
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/java/lang/Class.h
View file

@ -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;

4
libjava/java/lang/natClass.cc
View file

@ -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;