8038274: update 8u fix for 8028073 now that 8028280 is backported to 8u

Reviewed-by: coleenp, sspitsyn

src/share/vm/runtime/objectMonitor.cpp

@@ -1600,16 +1600,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
      // post monitor waited event. Note that this is past-tense, we are done waiting.
      if (JvmtiExport::should_post_monitor_waited()) {
        JvmtiExport::post_monitor_waited(jt, this, ret == OS_TIMEOUT);
-     }
 
-     // Without the fix for 8028280, it is possible for the above call:
-     //
-     //   Thread::SpinAcquire (&_WaitSetLock, "WaitSet - unlink") ;
-     //
-     // to consume the unpark() that was done when the successor was set.
-     // The solution for this very rare possibility is to redo the unpark()
-     // outside of the JvmtiExport::should_post_monitor_waited() check.
-     //
        if (node._notified != 0 && _succ == Self) {
          // In this part of the monitor wait-notify-reenter protocol it
          // is possible (and normal) for another thread to do a fastpath
@@ -1628,6 +1619,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
          // entering the unlocked monitor.
          node._event->unpark();
        }
+     }
 
      if (event.should_commit()) {
        post_monitor_wait_event(&event, node._notifier_tid, millis, ret == OS_TIMEOUT);