jni.cc (_Jv_JNI_GetAnyFieldID): Handle unresolved fields.
* jni.cc (_Jv_JNI_GetAnyFieldID): Handle unresolved fields. * java/lang/reflect/natField.cc (getType): Use _Jv_ResolveField unconditionally. * include/jvm.h (_Jv_ResolveField): Declare. * include/java-interp.h (_Jv_ResolveField): Don't declare. * resolve.cc (_Jv_ResolveField): No longer conditional on INTERPRETER. From-SVN: r40785
This commit is contained in:
parent
e9f4fa7143
commit
83c64db681
7 changed files with 40 additions and 33 deletions
|
@ -678,7 +678,7 @@ java::lang::Class::finalize (void)
|
|||
void
|
||||
java::lang::Class::initializeClass (void)
|
||||
{
|
||||
// jshort-circuit to avoid needless locking.
|
||||
// short-circuit to avoid needless locking.
|
||||
if (state == JV_STATE_DONE)
|
||||
return;
|
||||
|
||||
|
@ -713,7 +713,9 @@ 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
|
||||
|| thread == self)
|
||||
{
|
||||
_Jv_MonitorExit (this);
|
||||
return;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue