--- old/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	2016-08-19 12:32:29.986481442 +0200
+++ new/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp	2016-08-19 12:32:29.834478040 +0200
@@ -2041,6 +2041,11 @@
       __ verify_oop(r0);
   }
 
+  if (CheckJNICalls) {
+    // clear_pending_jni_exception_check
+    __ str(zr, Address(rthread, JavaThread::pending_jni_exception_check_fn_offset());
+  }
+
   if (!is_critical_native) {
     // reset handle block
     __ ldr(r2, Address(rthread, JavaThread::active_handles_offset()));