Mercurial > hg > graal-compiler
changeset 12279:6eb908998b32
Merge
author | kevinw |
---|---|
date | Thu, 19 Sep 2013 08:47:46 +0200 |
parents | dfae98867ee8 (current diff) 8c84f04ff977 (diff) |
children | 9ed97b511b26 4f9a42c33738 |
files | |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnvBase.hpp Wed Sep 18 20:08:00 2013 -0400 +++ b/src/share/vm/prims/jvmtiEnvBase.hpp Thu Sep 19 08:47:46 2013 +0200 @@ -406,7 +406,11 @@ VMOp_Type type() const { return VMOp_GetCurrentContendedMonitor; } jvmtiError result() { return _result; } void doit() { - _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr); + _result = JVMTI_ERROR_THREAD_NOT_ALIVE; + if (Threads::includes(_java_thread) && !_java_thread->is_exiting() && + _java_thread->threadObj() != NULL) { + _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr); + } } };