infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-21 19:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8035734: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Choice.cpp

Browse Source 
Reviewed-by: anthony, serb
This commit is contained in:
Petr Pchelko 2014-04-10 11:56:01 +04:00
parent c3a9369016
commit f7bbe45067
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/windows/native/sun/windows/awt_Choice.cpp
View File

@ -157,6 +157,7 @@ AwtChoice* AwtChoice::Create(jobject peer, jobject parent) {
"preferredSize",
"()Ljava/awt/Dimension;").l;
DASSERT(!safe_ExceptionOccurred(env));
if (env->ExceptionCheck()) goto done;
if (dimension != NULL && width == 0) {
width = env->GetIntField(dimension, AwtDimension::widthID);
@ -337,9 +338,8 @@ jobject AwtChoice::PreferredItemSize(JNIEnv *env)
"preferredSize",
"()Ljava/awt/Dimension;").l;
DASSERT(!safe_ExceptionOccurred(env));
if (dimension == NULL) {
return NULL;
}
CHECK_NULL_RETURN(dimension, NULL);
/* This size is window size of choice and it's too big for each
* drop down item height.
*/
@ -605,7 +605,8 @@ void AwtChoice::_AddItems(void *param)
for (i = 0; i < itemCount; i++)
{
jstring item = (jstring)env->GetObjectArrayElement(items, i);
JNI_CHECK_NULL_GOTO(item, "null item", next_elem);
if (env->ExceptionCheck()) goto done;
if (item == NULL) goto next_elem;
c->SendMessage(CB_INSERTSTRING, index + i, JavaStringBuffer(env, item));
env->DeleteLocalRef(item);
next_elem: