src/hotspot/share/runtime/safepointMechanism.inline.hpp

rev 50557 : [mq]: 8204166

@@ -57,16 +57,15 @@
 
 void SafepointMechanism::block_if_requested_local_poll(JavaThread *thread) {
   bool armed = local_poll_armed(thread); // load acquire, polling page -> op / global state
   if(armed) {
     // We could be armed for either a handshake operation or a safepoint
-    if (thread->has_handshake()) {
-      thread->handshake_process_by_self();
-    } else {
       if (global_poll()) {
         SafepointSynchronize::block(thread);
       }
+    if (thread->has_handshake()) {
+      thread->handshake_process_by_self();
     }
   }
 }
 
 void SafepointMechanism::block_if_requested(JavaThread *thread) {