src/hotspot/share/runtime/objectMonitor.cpp

*** 1265,1283 ****
    // TODO-FIXME: change the following logic to a loop of the form
    //   while (!timeout && !interrupted && _notified == 0) park()
  
    int ret = OS_OK;
    int WasNotified = 0;
    { // State transition wrappers
      OSThread* osthread = Self->osthread();
      OSThreadWaitState osts(osthread, true);
      {
        ThreadBlockInVM tbivm(jt);
        // Thread is in thread_blocked state and oop access is unsafe.
        jt->set_suspend_equivalent();
  
!       if (interruptible && (jt->is_interrupted(false) || HAS_PENDING_EXCEPTION)) {
          // Intentionally empty
        } else if (node._notified == 0) {
          if (millis <= 0) {
            Self->_ParkEvent->park();
          } else {
--- 1265,1287 ----
    // TODO-FIXME: change the following logic to a loop of the form
    //   while (!timeout && !interrupted && _notified == 0) park()
  
    int ret = OS_OK;
    int WasNotified = 0;
+ 
+   // Need to check interrupt state whilst still _thread_in_vm
+   bool interrupted = interruptible && jt->is_interrupted(false);
+ 
    { // State transition wrappers
      OSThread* osthread = Self->osthread();
      OSThreadWaitState osts(osthread, true);
      {
        ThreadBlockInVM tbivm(jt);
        // Thread is in thread_blocked state and oop access is unsafe.
        jt->set_suspend_equivalent();
  
!       if (interrupted || HAS_PENDING_EXCEPTION) {
          // Intentionally empty
        } else if (node._notified == 0) {
          if (millis <= 0) {
            Self->_ParkEvent->park();
          } else {