*** old/src/share/vm/prims/whitebox.hpp	Thu Feb 13 22:40:38 2014
--- new/src/share/vm/prims/whitebox.hpp	Thu Feb 13 22:40:38 2014

*** 36,55 ****
--- 36,57 ----
  #define WB_END JNI_END
  #define WB_METHOD_DECLARE(result_type) extern "C" result_type JNICALL
  
  #define CHECK_JNI_EXCEPTION_(env, value)                               \
    do {                                                                 \
!     if (env->ExceptionCheck()) {         \
!       env->ExceptionClear();             \
!     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
!     if (HAS_PENDING_EXCEPTION) {                                       \
+       CLEAR_PENDING_EXCEPTION;                                         \
        return(value);                                                   \
      }                                                                  \
    } while (0)
  
  #define CHECK_JNI_EXCEPTION(env)                                       \
    do {                                                                 \
!     if (env->ExceptionCheck()) { \
!       env->ExceptionClear();     \
!     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
!     if (HAS_PENDING_EXCEPTION) {                                       \
+       CLEAR_PENDING_EXCEPTION;                                         \
        return;                                                          \
      }                                                                  \
    } while (0)
  
  class WhiteBox : public AllStatic {