< prev index next >

src/share/bin/java.h

Print this page
rev 11229 : 8068033: JNI exception pending in jdk/src/share/bin/java.c
Reviewed-by: mchung, serb

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -254,10 +254,17 @@
     NULL_CHECK_RETURN_VALUE(NC0_check_pointer, 0)
 
 #define NULL_CHECK(NC_check_pointer) \
     NULL_CHECK_RETURN_VALUE(NC_check_pointer, )
 
+#define CHECK_EXCEPTION_RETURN() \
+    do { \
+        if ((*env)->ExceptionOccurred(env)) { \
+            return; \
+        } \
+    } while (JNI_FALSE)
+
 /*
  * For JNI calls :
  *  - check for thrown exceptions
  *  - check for null return
  *
< prev index next >