src/hotspot/share/runtime/vmThread.cpp

rev 54227 : imported patch 8220774-handshakealot-v4
rev 54228 : [mq]: 8220774-handshakealot-v5

@@ -502,15 +502,15 @@
             (os::elapsedTime() > (double)SelfDestructTimer * 60.0)) {
           tty->print_cr("VM self-destructed");
           exit(-1);
         }
 
-        {
+        if (timedout) {
           // Have to unlock VMOperationQueue_lock just in case no_op_safepoint()
           // has to do a handshake.
           MutexUnlockerEx mul(VMOperationQueue_lock, Mutex::_no_safepoint_check_flag);
-          if (timedout && (_cur_vm_operation = VMThread::no_op_safepoint()) != NULL) {
+          if ((_cur_vm_operation = VMThread::no_op_safepoint()) != NULL) {
             // Force a safepoint since we have not had one for at least
             // 'GuaranteedSafepointInterval' milliseconds and we need to clean
             // something. This will run all the clean-up processing that needs
             // to be done at a safepoint.
             SafepointSynchronize::begin();