Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiEnvBase.hpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | c1d7040a1183 |
children | de6a9e811145 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnvBase.hpp Thu Oct 10 18:26:22 2013 +0200 +++ b/src/share/vm/prims/jvmtiEnvBase.hpp Fri Oct 11 10:38:03 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); + } } };