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

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

Browse Source 
Reviewed-by: azvegint, prr
This commit is contained in:
Sergey Bylokhov 2014-08-14 14:19:58 +01:00
parent 94d91b1382
commit 110fc8e47f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
View File

@ -1348,7 +1348,9 @@ JNIEnv *env, jobject this)
}
/* Make Color Model object for this GraphicsConfiguration */
colorModel = awtJNI_GetColorModel (env, adata);
colorModel = (*env)->ExceptionCheck(env)
? NULL : awtJNI_GetColorModel (env, adata);
AWT_UNLOCK ();
return colorModel;
@ -2052,7 +2054,7 @@ Java_sun_awt_X11GraphicsDevice_configDisplayMode
AWT_FLUSH_UNLOCK();
if (!success) {
if (!success && !(*env)->ExceptionCheck(env)) {
JNU_ThrowInternalError(env, "Could not set display mode");
}
#endif /* !HEADLESS */

8
jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
View File

@ -246,8 +246,14 @@ static jobjectArray toFilenamesArray(JNIEnv *env, GSList* list, jstring* jcurren
}
str = (*env)->NewStringUTF(env, entry);
if (str && !(*env)->ExceptionCheck(env)) {
if((*env)->ExceptionCheck(env)){
break;
}
if (str) {
(*env)->SetObjectArrayElement(env, array, i, str);
if((*env)->ExceptionCheck(env)){
break;
}
}
}