Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
11fa7d56
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看板
提交
11fa7d56
编写于
1月 26, 2018
作者:
A
alitvinov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8177758: Regression in java.awt.FileDialog
Reviewed-by: sveerabhadra, serb
上级
8cb4053b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
74 addition
and
8 deletion
+74
-8
src/windows/native/sun/windows/awt_FileDialog.cpp
src/windows/native/sun/windows/awt_FileDialog.cpp
+2
-8
test/java/awt/FileDialog/FileDialogMemoryLeak/FileDialogLeakTest.java
...t/FileDialog/FileDialogMemoryLeak/FileDialogLeakTest.java
+72
-0
未找到文件。
src/windows/native/sun/windows/awt_FileDialog.cpp
浏览文件 @
11fa7d56
/*
* Copyright (c) 1996, 201
4
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
7
, 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
...
...
@@ -251,13 +251,7 @@ AwtFileDialog::Show(void *p)
OPENFILENAME
ofn
;
memset
(
&
ofn
,
0
,
sizeof
(
ofn
));
/*
* There's a situation (see bug 4906972) when InvokeFunction (by which this method is called)
* returnes earlier than this method returnes. Probably it's caused due to ReplyMessage system call.
* So for the avoidance of this mistiming we need to make new global reference here
* (not local as it's used by the hook) and then manage it independently of the calling thread.
*/
peer
=
env
->
NewGlobalRef
((
jobject
)
p
);
peer
=
(
jobject
)
p
;
try
{
DASSERT
(
peer
);
...
...
test/java/awt/FileDialog/FileDialogMemoryLeak/FileDialogLeakTest.java
0 → 100644
浏览文件 @
11fa7d56
/*
* Copyright (c) 2017, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import
java.awt.*
;
import
java.util.concurrent.CountDownLatch
;
import
java.util.concurrent.TimeUnit
;
/**
* @test
* @bug 8177758
* @requires os.family == "windows"
* @summary Regression in java.awt.FileDialog
* @run main FileDialogLeakTest
*/
public
class
FileDialogLeakTest
{
static
CountDownLatch
latch
=
new
CountDownLatch
(
3
);
static
boolean
passed
;
public
static
void
main
(
String
[]
args
)
throws
Exception
{
test
();
System
.
gc
();
System
.
runFinalization
();
latch
.
await
(
1
,
TimeUnit
.
SECONDS
);
if
(!
passed
)
{
throw
new
RuntimeException
(
"Test failed."
);
}
}
private
static
void
test
()
throws
Exception
{
FileDialog
fd
=
new
FileDialog
((
Frame
)
null
)
{
@Override
protected
void
finalize
()
throws
Throwable
{
System
.
out
.
println
(
"Finalize"
);
super
.
finalize
();
passed
=
true
;
latch
.
countDown
();
}
};
new
Thread
(()
->
{
latch
.
countDown
();
fd
.
setVisible
(
true
);
latch
.
countDown
();
}).
start
();
latch
.
await
(
1
,
TimeUnit
.
SECONDS
);
fd
.
dispose
();
latch
.
await
(
1
,
TimeUnit
.
SECONDS
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录