src/hotspot/share/prims/jvmtiEnv.cpp

*** 1301,1313 ****
    // It is only safe to perform the direct operation on the current
    // thread. All other usage needs to use a vm-safepoint-op for safety.
    if (java_thread == calling_thread) {
      err = get_current_contended_monitor(calling_thread, java_thread, monitor_ptr);
    } else {
!     // get contended monitor information at safepoint.
!     VM_GetCurrentContendedMonitor op(this, calling_thread, java_thread, monitor_ptr);
!     VMThread::execute(&op);
      err = op.result();
    }
    return err;
  } /* end GetCurrentContendedMonitor */
  
--- 1301,1313 ----
    // It is only safe to perform the direct operation on the current
    // thread. All other usage needs to use a vm-safepoint-op for safety.
    if (java_thread == calling_thread) {
      err = get_current_contended_monitor(calling_thread, java_thread, monitor_ptr);
    } else {
!     // get contended monitor information with handshake.
!     GetOneCurrentContendedMonitor op(this, calling_thread, monitor_ptr);
!     Handshake::execute(&op, java_thread);
      err = op.result();
    }
    return err;
  } /* end GetCurrentContendedMonitor */