stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: azvegint, prr
This commit is contained in:
Sergey Bylokhov 2014-08-12 14:38:38 +04:00
parent 2d67061cd9
commit 149fb94d76
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/solaris/native/sun/awt/X11Color.c
View File

@ -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);

6
jdk/src/solaris/native/sun/awt/awt.h
View File

@ -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)