8285399: JNI exception pending in awt_GraphicsEnv.c:1432

Backport-of: c156bcc599534ae989bc9cbd001e7c150da8096c
openjdk · Jan 2, 2023 · d1f6bd1 · d1f6bd1 · openjdk-notifier · Jan 2, 2023
1 parent c898a3e
commit d1f6bd1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/java.desktop/unix/native/common/awt/awt.h b/src/java.desktop/unix/native/common/awt/awt.h
@@ -85,6 +85,9 @@ extern void awt_output_flush();
 
 #define AWT_LOCK_IMPL() \
     do { \
+        if ((*env)->ExceptionCheck(env)) { \
+            (*env)->ExceptionClear(env); \
+        } \
         (*env)->CallStaticVoidMethod(env, tkClass, awtLockMID); \
         if ((*env)->ExceptionCheck(env)) { \
             (*env)->ExceptionClear(env); \

diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c b/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
@@ -1635,10 +1635,10 @@ Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals(JNIEnv *env,
     AWT_FLUSH_UNLOCK();
     for (i = 0; i < visScreenInfo->count; i++) {
         XdbeVisualInfo* visInfo = visScreenInfo->visinfo;
-        (*env)->CallVoidMethod(env, this, midAddVisual, (visInfo[i]).visual);
         if ((*env)->ExceptionCheck(env)) {
             break;
         }
+        (*env)->CallVoidMethod(env, this, midAddVisual, (visInfo[i]).visual);
     }
     AWT_LOCK();
     XdbeFreeVisualInfo(visScreenInfo);