6798062: Memory Leak on using getFiles of FileSystemView
Reviewed-by: peterz, malenkov
--- a/jdk/src/windows/native/sun/windows/ShellFolder2.cpp Mon Mar 23 16:41:47 2009 +0300
+++ b/jdk/src/windows/native/sun/windows/ShellFolder2.cpp Thu Mar 26 11:04:47 2009 +0300
@@ -685,6 +685,9 @@
psl->Release();
}
+ if (strret.uType == STRRET_WSTR) {
+ CoTaskMemFree(strret.pOleStr);
+ }
if (SUCCEEDED(hres)) {
return (jlong)pidl;
} else {
@@ -747,7 +750,11 @@
if (pParent->GetDisplayNameOf(pidl, attrs, &strret) != S_OK) {
return NULL;
}
- return jstringFromSTRRET(env, pidl, &strret);
+ jstring result = jstringFromSTRRET(env, pidl, &strret);
+ if (strret.uType == STRRET_WSTR) {
+ CoTaskMemFree(strret.pOleStr);
+ }
+ return result;
}
/*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.html Thu Mar 26 11:04:47 2009 +0300
@@ -0,0 +1,11 @@
+<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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JFileChooser/6798062/bug6798062.java Thu Mar 26 11:04:47 2009 +0300
@@ -0,0 +1,189 @@
+/*
+ * 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;
+ }
+ }
+ }
+ }
+ }
+}