archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8285399: JNI exception pending in awt_GraphicsEnv.c:1432

Browse source 
Reviewed-by: azvegint, serb
This commit is contained in:
Phil Race 2022-05-21 16:05:24 +00:00
parent 7c0864752a
commit c156bcc599
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/java.desktop/unix/native/common/awt/awt.h
View file

@ -85,6 +85,9 @@ extern void awt_output_flush();
#define AWT_LOCK_IMPL() \ #define AWT_LOCK_IMPL() \
do { \ do { \
if ((*env)->ExceptionCheck(env)) { \
(*env)->ExceptionClear(env); \
} \
(*env)->CallStaticVoidMethod(env, tkClass, awtLockMID); \ (*env)->CallStaticVoidMethod(env, tkClass, awtLockMID); \
if ((*env)->ExceptionCheck(env)) { \ if ((*env)->ExceptionCheck(env)) { \
(*env)->ExceptionClear(env); \ (*env)->ExceptionClear(env); \

2
src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
View file

@ -1425,10 +1425,10 @@ Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals(JNIEnv *env,
AWT_FLUSH_UNLOCK(); AWT_FLUSH_UNLOCK();
for (i = 0; i < visScreenInfo->count; i++) { for (i = 0; i < visScreenInfo->count; i++) {
XdbeVisualInfo* visInfo = visScreenInfo->visinfo; XdbeVisualInfo* visInfo = visScreenInfo->visinfo;
(*env)->CallVoidMethod(env, this, midAddVisual, (visInfo[i]).visual);
if ((*env)->ExceptionCheck(env)) { if ((*env)->ExceptionCheck(env)) {
break; break;
} }
(*env)->CallVoidMethod(env, this, midAddVisual, (visInfo[i]).visual);
} }
AWT_LOCK(); AWT_LOCK();
XdbeFreeVisualInfo(visScreenInfo); XdbeFreeVisualInfo(visScreenInfo);