infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-14 12:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: serb, pchelko
This commit is contained in:
Alexander Zvegintsev 2014-03-05 16:36:49 +04:00
parent 40c9b22337
commit 5cdcfca437
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jdk/src/windows/native/sun/windows/awt_Dialog.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,6 +23,7 @@
* questions.
*/
#include "jni_util.h"
#include "awt_Toolkit.h"
#include "awt_Dialog.h"
#include "awt_Window.h"
@ -457,18 +458,25 @@ void AwtDialog::ModalActivateNextWindow(HWND dialogHWnd,
{
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
jclass wwindowPeerCls = env->FindClass("sun/awt/windows/WWindowPeer");
jmethodID getActiveWindowsMID = env->GetStaticMethodID(wwindowPeerCls,
"getActiveWindowHandles", "()[J");
DASSERT(getActiveWindowsMID != NULL);
jlongArray windows = (jlongArray)(env->CallStaticObjectMethod(wwindowPeerCls,
getActiveWindowsMID));
jboolean exc;
jlongArray windows = (jlongArray) JNU_CallStaticMethodByName
(env,
&exc,
"sun/awt/windows/WWindowPeer",
"getActiveWindowHandles",
"()[J").l;
if (exc == JNI_TRUE) {
throw std::bad_alloc();
}
if (windows == NULL) {
return;
}
jboolean isCopy;
jlong *ws = env->GetLongArrayElements(windows, &isCopy);
if (ws == NULL) {
throw std::bad_alloc();
}
int windowsCount = env->GetArrayLength(windows);
for (int i = windowsCount - 1; i >= 0; i--) {
HWND w = (HWND)ws[i];
@ -744,11 +752,13 @@ Java_java_awt_Dialog_initIDs(JNIEnv *env, jclass cls)
/* java.awt.Dialog fields and methods */
AwtDialog::titleID
= env->GetFieldID(cls, "title", "Ljava/lang/String;");
DASSERT(AwtDialog::titleID != NULL);
CHECK_NULL(AwtDialog::titleID);
AwtDialog::undecoratedID
= env->GetFieldID(cls,"undecorated","Z");
DASSERT(AwtDialog::undecoratedID != NULL);
DASSERT(AwtDialog::titleID != NULL);
CHECK_NULL(AwtDialog::undecoratedID);
CATCH_BAD_ALLOC;
}