comparison 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
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
404 _owned_monitor_ptr = mon_ptr; 404 _owned_monitor_ptr = mon_ptr;
405 } 405 }
406 VMOp_Type type() const { return VMOp_GetCurrentContendedMonitor; } 406 VMOp_Type type() const { return VMOp_GetCurrentContendedMonitor; }
407 jvmtiError result() { return _result; } 407 jvmtiError result() { return _result; }
408 void doit() { 408 void doit() {
409 _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr); 409 _result = JVMTI_ERROR_THREAD_NOT_ALIVE;
410 if (Threads::includes(_java_thread) && !_java_thread->is_exiting() &&
411 _java_thread->threadObj() != NULL) {
412 _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr);
413 }
410 } 414 }
411 }; 415 };
412 416
413 // VM operation to get stack trace at safepoint. 417 // VM operation to get stack trace at safepoint.
414 class VM_GetStackTrace : public VM_Operation { 418 class VM_GetStackTrace : public VM_Operation {