提交 6eecc96e 编写于 作者: S serb

8046887: JNI exception pending in jdk/src/solaris/native/sun/awt:...

8046887: JNI exception pending in jdk/src/solaris/native/sun/awt: awt_DrawingSurface.c, awt_GraphicsEnv.c, awt_InputMethod.c, sun_awt_X11_GtkFileDialogPeer.c
Reviewed-by: azvegint, prr
上级 22223e63
...@@ -1348,7 +1348,9 @@ JNIEnv *env, jobject this) ...@@ -1348,7 +1348,9 @@ JNIEnv *env, jobject this)
} }
/* Make Color Model object for this GraphicsConfiguration */ /* Make Color Model object for this GraphicsConfiguration */
colorModel = awtJNI_GetColorModel (env, adata); colorModel = (*env)->ExceptionCheck(env)
? NULL : awtJNI_GetColorModel (env, adata);
AWT_UNLOCK (); AWT_UNLOCK ();
return colorModel; return colorModel;
...@@ -2052,7 +2054,7 @@ Java_sun_awt_X11GraphicsDevice_configDisplayMode ...@@ -2052,7 +2054,7 @@ Java_sun_awt_X11GraphicsDevice_configDisplayMode
AWT_FLUSH_UNLOCK(); AWT_FLUSH_UNLOCK();
if (!success) { if (!success && !(*env)->ExceptionCheck(env)) {
JNU_ThrowInternalError(env, "Could not set display mode"); JNU_ThrowInternalError(env, "Could not set display mode");
} }
#endif /* !HEADLESS */ #endif /* !HEADLESS */
......
...@@ -246,8 +246,14 @@ static jobjectArray toFilenamesArray(JNIEnv *env, GSList* list, jstring* jcurren ...@@ -246,8 +246,14 @@ static jobjectArray toFilenamesArray(JNIEnv *env, GSList* list, jstring* jcurren
} }
str = (*env)->NewStringUTF(env, entry); str = (*env)->NewStringUTF(env, entry);
if (str && !(*env)->ExceptionCheck(env)) { if((*env)->ExceptionCheck(env)){
break;
}
if (str) {
(*env)->SetObjectArrayElement(env, array, i, str); (*env)->SetObjectArrayElement(env, array, i, str);
if((*env)->ExceptionCheck(env)){
break;
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册