# HG changeset patch
# User dholmes
# Date 1527628891 14400
# Node ID 896486c6e35763e14e5d8f07de895a4ccde08139
# Parent  188a87cbfac36fddf1bbb73ffeb24a798654d89b
8189766: whitebox failure with -Xcheck:jni
Reviewed-by: lfoltan, kbarrett

diff -r 188a87cbfac3 -r 896486c6e357 src/hotspot/share/prims/whitebox.cpp
--- a/src/hotspot/share/prims/whitebox.cpp	Tue May 29 16:02:23 2018 -0400
+++ b/src/hotspot/share/prims/whitebox.cpp	Tue May 29 17:21:31 2018 -0400
@@ -98,6 +98,7 @@
 #define CHECK_JNI_EXCEPTION_(env, value)                               \
   do {                                                                 \
     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
+    THREAD->clear_pending_jni_exception_check();                       \
     if (HAS_PENDING_EXCEPTION) {                                       \
       return(value);                                                   \
     }                                                                  \
@@ -106,6 +107,7 @@
 #define CHECK_JNI_EXCEPTION(env)                                       \
   do {                                                                 \
     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
+    THREAD->clear_pending_jni_exception_check();                       \
     if (HAS_PENDING_EXCEPTION) {                                       \
       return;                                                          \
     }                                                                  \