Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
ad14ceed
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ad14ceed
编写于
3月 26, 2009
作者:
R
rupashka
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6798062: Memory Leak on using getFiles of FileSystemView
Reviewed-by: peterz, malenkov
上级
5b08475d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
208 addition
and
1 deletion
+208
-1
src/windows/native/sun/windows/ShellFolder2.cpp
src/windows/native/sun/windows/ShellFolder2.cpp
+8
-1
test/javax/swing/JFileChooser/6798062/bug6798062.html
test/javax/swing/JFileChooser/6798062/bug6798062.html
+11
-0
test/javax/swing/JFileChooser/6798062/bug6798062.java
test/javax/swing/JFileChooser/6798062/bug6798062.java
+189
-0
未找到文件。
src/windows/native/sun/windows/ShellFolder2.cpp
浏览文件 @
ad14ceed
...
@@ -685,6 +685,9 @@ JNIEXPORT jlong JNICALL Java_sun_awt_shell_Win32ShellFolder2_getLinkLocation
...
@@ -685,6 +685,9 @@ JNIEXPORT jlong JNICALL Java_sun_awt_shell_Win32ShellFolder2_getLinkLocation
psl
->
Release
();
psl
->
Release
();
}
}
if
(
strret
.
uType
==
STRRET_WSTR
)
{
CoTaskMemFree
(
strret
.
pOleStr
);
}
if
(
SUCCEEDED
(
hres
))
{
if
(
SUCCEEDED
(
hres
))
{
return
(
jlong
)
pidl
;
return
(
jlong
)
pidl
;
}
else
{
}
else
{
...
@@ -747,7 +750,11 @@ JNIEXPORT jstring JNICALL Java_sun_awt_shell_Win32ShellFolder2_getDisplayNameOf
...
@@ -747,7 +750,11 @@ JNIEXPORT jstring JNICALL Java_sun_awt_shell_Win32ShellFolder2_getDisplayNameOf
if
(
pParent
->
GetDisplayNameOf
(
pidl
,
attrs
,
&
strret
)
!=
S_OK
)
{
if
(
pParent
->
GetDisplayNameOf
(
pidl
,
attrs
,
&
strret
)
!=
S_OK
)
{
return
NULL
;
return
NULL
;
}
}
return
jstringFromSTRRET
(
env
,
pidl
,
&
strret
);
jstring
result
=
jstringFromSTRRET
(
env
,
pidl
,
&
strret
);
if
(
strret
.
uType
==
STRRET_WSTR
)
{
CoTaskMemFree
(
strret
.
pOleStr
);
}
return
result
;
}
}
/*
/*
...
...
test/javax/swing/JFileChooser/6798062/bug6798062.html
0 → 100644
浏览文件 @
ad14ceed
<html>
<body>
<applet
code=
"bug6798062.class"
width=
400
height=
300
></applet>
1. Create a link
2. Copy path to the link into TextField
3. Run the Windows Task Manager. Select the Processes tab and find the java process
4. Press the Start button in the test window
5. Wait several minutes and observe in the Windows Task Manager
that Memory Usage of java process is not increasing
</body>
</html>
test/javax/swing/JFileChooser/6798062/bug6798062.java
0 → 100644
浏览文件 @
ad14ceed
/*
* Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/* @test %W% %E%
@bug 6798062
@summary Memory Leak on using getFiles of FileSystemView
@author Pavel Porvatov
@run applet/manual=done bug6798062.html
*/
import
sun.awt.shell.ShellFolder
;
import
javax.swing.*
;
import
java.awt.event.ActionEvent
;
import
java.awt.event.ActionListener
;
import
java.awt.*
;
import
java.io.File
;
import
java.io.FileNotFoundException
;
public
class
bug6798062
extends
JApplet
{
private
final
JSlider
slider
=
new
JSlider
(
0
,
100
);
private
final
JTextField
tfLink
=
new
JTextField
();
private
final
JButton
btnStart
=
new
JButton
(
"Start"
);
private
final
JButton
btnStop
=
new
JButton
(
"Stop"
);
private
final
JButton
btnGC
=
new
JButton
(
"Run System.gc()"
);
private
ShellFolder
folder
;
private
Thread
thread
;
public
static
void
main
(
String
[]
args
)
{
JFrame
frame
=
new
JFrame
(
"bug6798062"
);
frame
.
setSize
(
400
,
300
);
frame
.
setLocationRelativeTo
(
null
);
frame
.
setDefaultCloseOperation
(
JFrame
.
EXIT_ON_CLOSE
);
frame
.
add
(
new
bug6798062
().
initialize
());
frame
.
setVisible
(
true
);
}
public
void
init
()
{
add
(
initialize
());
}
private
JPanel
initialize
()
{
File
file
=
new
File
(
"c:/"
);
try
{
folder
=
ShellFolder
.
getShellFolder
(
file
);
}
catch
(
FileNotFoundException
e
)
{
fail
(
"Directory "
+
file
.
getPath
()
+
" not found"
);
}
slider
.
setMajorTickSpacing
(
10
);
slider
.
setPaintTicks
(
true
);
slider
.
setPaintLabels
(
true
);
slider
.
setSnapToTicks
(
true
);
slider
.
setValue
(
10
);
btnStart
.
addActionListener
(
new
ActionListener
()
{
public
void
actionPerformed
(
ActionEvent
e
)
{
setEnabledState
(
false
);
thread
=
new
MyThread
(
slider
.
getValue
(),
tfLink
.
getText
());
thread
.
start
();
}
});
btnStop
.
setEnabled
(
false
);
btnStop
.
addActionListener
(
new
ActionListener
()
{
public
void
actionPerformed
(
ActionEvent
e
)
{
thread
.
interrupt
();
thread
=
null
;
setEnabledState
(
true
);
}
});
btnGC
.
addActionListener
(
new
ActionListener
()
{
public
void
actionPerformed
(
ActionEvent
e
)
{
System
.
gc
();
}
});
setEnabledState
(
true
);
JPanel
pnButtons
=
new
JPanel
();
pnButtons
.
setLayout
(
new
BoxLayout
(
pnButtons
,
BoxLayout
.
X_AXIS
));
pnButtons
.
add
(
btnStart
);
pnButtons
.
add
(
btnStop
);
pnButtons
.
add
(
btnGC
);
tfLink
.
setMaximumSize
(
new
Dimension
(
300
,
20
));
JPanel
pnContent
=
new
JPanel
();
pnContent
.
setLayout
(
new
BoxLayout
(
pnContent
,
BoxLayout
.
Y_AXIS
));
pnContent
.
add
(
new
JLabel
(
"Delay between listFiles() invocation (ms):"
));
pnContent
.
add
(
slider
);
pnContent
.
add
(
new
JLabel
(
"Provide link here:"
));
pnContent
.
add
(
tfLink
);
pnContent
.
add
(
pnButtons
);
return
pnContent
;
}
private
void
setEnabledState
(
boolean
enabled
)
{
slider
.
setEnabled
(
enabled
);
btnStart
.
setEnabled
(
enabled
);
btnStop
.
setEnabled
(!
enabled
);
}
private
static
void
fail
(
String
msg
)
{
throw
new
RuntimeException
(
msg
);
}
private
class
MyThread
extends
Thread
{
private
final
int
delay
;
private
final
ShellFolder
link
;
private
MyThread
(
int
delay
,
String
link
)
{
this
.
delay
=
delay
;
ShellFolder
linkFolder
;
try
{
linkFolder
=
ShellFolder
.
getShellFolder
(
new
File
(
link
));
}
catch
(
FileNotFoundException
e
)
{
e
.
printStackTrace
();
linkFolder
=
null
;
}
this
.
link
=
linkFolder
;
}
public
void
run
()
{
while
(!
isInterrupted
())
{
folder
.
listFiles
();
if
(
link
!=
null
)
{
try
{
link
.
getLinkLocation
();
}
catch
(
FileNotFoundException
e
)
{
e
.
printStackTrace
();
}
}
if
(
delay
>
0
)
{
try
{
Thread
.
sleep
(
delay
);
}
catch
(
InterruptedException
e1
)
{
// The thread was interrupted
return
;
}
}
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录