src/share/native/common/jni_util.h

*** 295,304 ****
--- 295,319 ----
          if ((x) == NULL) {                      \
              return (y);                         \
          }                                       \
      } while (0)                                 \
  
+ #ifdef __cplusplus
+ #define JNU_CHECK_EXCEPTION(env)                \
+     do {                                        \
+         if ((env)->ExceptionCheck()) {          \
+             return;                             \
+         }                                       \
+     } while (0)                                 \
+ 
+ #define JNU_CHECK_EXCEPTION_RETURN(env, y)      \
+     do {                                        \
+         if ((env)->ExceptionCheck()) {          \
+             return (y);                         \
+         }                                       \
+     } while (0)
+ #else
  #define JNU_CHECK_EXCEPTION(env)                \
      do {                                        \
          if ((*env)->ExceptionCheck(env)) {      \
              return;                             \
          }                                       \
*** 308,318 ****
      do {                                        \
          if ((*env)->ExceptionCheck(env)) {      \
              return (y);                         \
          }                                       \
      } while (0)
! 
  /************************************************************************
   * Debugging utilities
   */
  
  JNIEXPORT void JNICALL
--- 323,333 ----
      do {                                        \
          if ((*env)->ExceptionCheck(env)) {      \
              return (y);                         \
          }                                       \
      } while (0)
! #endif
  /************************************************************************
   * Debugging utilities
   */
  
  JNIEXPORT void JNICALL