提交 cc3bab51 编写于 作者: S serb

8046894: JNI exception pending in jdk/src/solaris/native/sun/awt/X11Color.c

Reviewed-by: azvegint, prr
上级 2d8c6044
...@@ -1377,7 +1377,7 @@ awtJNI_CreateColorData(JNIEnv *env, AwtGraphicsConfigDataPtr adata, ...@@ -1377,7 +1377,7 @@ awtJNI_CreateColorData(JNIEnv *env, AwtGraphicsConfigDataPtr adata,
/* Unlock now to initialize the SystemColor class */ /* Unlock now to initialize the SystemColor class */
if (lock) { if (lock) {
AWT_UNLOCK (); AWT_UNLOCK_CHECK_EXCEPTION(env);
} }
sysColors = (*env)->FindClass (env, "java/awt/SystemColor"); sysColors = (*env)->FindClass (env, "java/awt/SystemColor");
CHECK_NULL(sysColors); CHECK_NULL(sysColors);
......
...@@ -75,6 +75,12 @@ extern void awt_output_flush(); ...@@ -75,6 +75,12 @@ extern void awt_output_flush();
AWT_NOFLUSH_UNLOCK(); \ AWT_NOFLUSH_UNLOCK(); \
} while (0) } while (0)
#define AWT_UNLOCK_CHECK_EXCEPTION(env) \
do { \
AWT_UNLOCK(); \
JNU_CHECK_EXCEPTION(env); \
} while (0)
#define AWT_LOCK_IMPL() \ #define AWT_LOCK_IMPL() \
(*env)->CallStaticVoidMethod(env, tkClass, awtLockMID) (*env)->CallStaticVoidMethod(env, tkClass, awtLockMID)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册