--- a/src/hotspot/share/runtime/handshake.cpp	Mon Mar 25 09:35:40 2019 +0100
+++ b/src/hotspot/share/runtime/handshake.cpp	Thu Mar 28 11:08:23 2019 +0100
@@ -281,7 +281,7 @@
 
 void HandshakeState::clear_handshake(JavaThread* target) {
   _operation = NULL;
-  SafepointMechanism::disarm_local_poll_release(target);
+  SafepointMechanism::disarm_if_needed(target, true /* release */);
 }
 
 void HandshakeState::process_self_inner(JavaThread* thread) {