Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
9880d696
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9880d696
编写于
3月 13, 2014
作者:
S
serb
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8035843: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
Reviewed-by: pchelko, azvegint
上级
40eac1b2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
18 deletion
+16
-18
src/windows/native/sun/windows/awt_PopupMenu.cpp
src/windows/native/sun/windows/awt_PopupMenu.cpp
+16
-18
未找到文件。
src/windows/native/sun/windows/awt_PopupMenu.cpp
浏览文件 @
9880d696
/*
* Copyright (c) 1996, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
4
, 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
...
...
@@ -114,7 +114,6 @@ void AwtPopupMenu::Show(JNIEnv *env, jobject event, BOOL isTrayIconPopup)
* as the event's target.
*/
if
(
env
->
EnsureLocalCapacity
(
2
)
<
0
)
{
env
->
DeleteGlobalRef
(
event
);
return
;
}
jobject
origin
=
(
env
)
->
GetObjectField
(
event
,
AwtEvent
::
targetID
);
...
...
@@ -155,7 +154,6 @@ void AwtPopupMenu::Show(JNIEnv *env, jobject event, BOOL isTrayIconPopup)
done:
env
->
DeleteLocalRef
(
origin
);
env
->
DeleteLocalRef
(
peerOrigin
);
env
->
DeleteGlobalRef
(
event
);
}
void
AwtPopupMenu
::
_Show
(
void
*
param
)
...
...
@@ -164,29 +162,21 @@ void AwtPopupMenu::_Show(void *param)
static
jclass
popupMenuCls
;
if
(
popupMenuCls
==
NULL
)
{
jclass
popupMenuClsLocal
=
env
->
FindClass
(
"java/awt/PopupMenu"
);
if
(
!
popupMenuClsLocal
)
{
/* exception already thrown */
ShowStruct
*
ss
=
(
ShowStruct
*
)
param
;
if
(
ss
->
self
!=
NULL
)
{
env
->
DeleteGlobalRef
(
ss
->
self
);
}
delete
ss
;
return
;
jclass
popupMenuClsLocal
=
env
->
FindClass
(
"java/awt/PopupMenu"
);
if
(
popupMenuClsLocal
!=
NULL
)
{
popupMenuCls
=
(
jclass
)
env
->
NewGlobalRef
(
popupMenuClsLocal
);
env
->
DeleteLocalRef
(
popupMenuClsLocal
);
}
popupMenuCls
=
(
jclass
)
env
->
NewGlobalRef
(
popupMenuClsLocal
);
env
->
DeleteLocalRef
(
popupMenuClsLocal
);
}
static
jfieldID
isTrayIconPopupID
;
if
(
isTrayIconPopupID
==
NULL
)
{
if
(
popupMenuCls
!=
NULL
&&
isTrayIconPopupID
==
NULL
)
{
isTrayIconPopupID
=
env
->
GetFieldID
(
popupMenuCls
,
"isTrayIconPopup"
,
"Z"
);
DASSERT
(
isTrayIconPopupID
);
}
ShowStruct
*
ss
=
(
ShowStruct
*
)
param
;
if
(
ss
->
self
!=
NULL
)
{
if
(
ss
->
self
!=
NULL
&&
isTrayIconPopupID
!=
NULL
)
{
PDATA
pData
=
JNI_GET_PDATA
(
ss
->
self
);
if
(
pData
)
{
AwtPopupMenu
*
p
=
(
AwtPopupMenu
*
)
pData
;
...
...
@@ -195,9 +185,17 @@ void AwtPopupMenu::_Show(void *param)
env
->
DeleteLocalRef
(
target
);
p
->
Show
(
env
,
ss
->
event
,
isTrayIconPopup
);
}
}
if
(
ss
->
self
!=
NULL
)
{
env
->
DeleteGlobalRef
(
ss
->
self
);
}
if
(
ss
->
event
!=
NULL
)
{
env
->
DeleteGlobalRef
(
ss
->
event
);
}
delete
ss
;
if
(
isTrayIconPopupID
==
NULL
)
{
throw
std
::
bad_alloc
();
}
}
void
AwtPopupMenu
::
AddItem
(
AwtMenuItem
*
item
)
...
...
@@ -303,7 +301,7 @@ Java_sun_awt_windows_WPopupMenuPeer__1show(JNIEnv *env, jobject self,
// fix for 6268046: invoke the function without CriticalSection's synchronization
AwtToolkit
::
GetInstance
().
InvokeFunction
(
AwtPopupMenu
::
_Show
,
ss
);
// global ref
is deleted in _Show() and ss is deleted in
Show()
// global ref
and ss are deleted in _
Show()
CATCH_BAD_ALLOC
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录