Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 9362:a499de02da5a icedtea-2.6.12
Merge jdk7u161-b01
| author | andrew |
|---|---|
| date | Thu, 30 Nov 2017 03:00:27 +0000 |
| parents | f90ec7f94f1a (current diff) 2a7d0883d64a (diff) |
| children | f8d4ed4cc537 |
| files | .hgtags |
| diffstat | 2 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Nov 27 06:52:26 2017 +0000 +++ b/.hgtags Thu Nov 30 03:00:27 2017 +0000 @@ -664,3 +664,4 @@ 082c6e8b8812ad9c8bc175b2bcb65a3c470f36cd icedtea-2.6.11 8563ea7f9be76f69ec9e8de1ca131d4aae114480 icedtea-2.6.12pre01 18a07ae9631c8a06df924e3ff5b025cbf2295620 jdk7u161-b00 +48c4e54f7870bb2e6982ab946267f61e9d4f14d2 jdk7u161-b01
--- a/src/share/native/common/jni_util.h Mon Nov 27 06:52:26 2017 +0000 +++ b/src/share/native/common/jni_util.h Thu Nov 30 03:00:27 2017 +0000 @@ -304,6 +304,21 @@ } \ } 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)) { \ @@ -317,7 +332,7 @@ return (y); \ } \ } while (0) - +#endif /* __cplusplus */ /************************************************************************ * Debugging utilities */