6559589: Memory leak in JScrollPane.updateUI()
Reviewed-by: rupashka
This commit is contained in:
parent
d4e68b9bce
commit
c41b76c703
@ -81,17 +81,26 @@ public class MetalScrollPaneUI extends BasicScrollPaneUI
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void installListeners(JScrollPane scrollPane) {
|
||||
super.installListeners(scrollPane);
|
||||
scrollBarSwapListener = createScrollBarSwapListener();
|
||||
scrollPane.addPropertyChangeListener(scrollBarSwapListener);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
protected void uninstallListeners(JComponent c) {
|
||||
super.uninstallListeners(c);
|
||||
c.removePropertyChangeListener(scrollBarSwapListener);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated - Replaced by {@link #uninstallListeners(JComponent)}
|
||||
*/
|
||||
@Deprecated
|
||||
public void uninstallListeners(JScrollPane scrollPane) {
|
||||
super.uninstallListeners(scrollPane);
|
||||
|
||||
scrollPane.removePropertyChangeListener(scrollBarSwapListener);
|
||||
}
|
||||
|
||||
|
54
jdk/test/javax/swing/JScrollPane/6559589/bug6559589.java
Normal file
54
jdk/test/javax/swing/JScrollPane/6559589/bug6559589.java
Normal file
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 6559589
|
||||
* @summary Memory leak in JScrollPane.updateUI()
|
||||
* @author Alexander Potochkin
|
||||
* @run main bug6559589
|
||||
*/
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.plaf.metal.MetalLookAndFeel;
|
||||
|
||||
public class bug6559589 {
|
||||
|
||||
private static void createGui() {
|
||||
JScrollPane sp = new JScrollPane();
|
||||
int listenerCount = sp.getPropertyChangeListeners().length;
|
||||
sp.updateUI();
|
||||
if(listenerCount != sp.getPropertyChangeListeners().length) {
|
||||
throw new RuntimeException("Listeners' leak");
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
UIManager.setLookAndFeel(new MetalLookAndFeel());
|
||||
SwingUtilities.invokeAndWait(new Runnable() {
|
||||
public void run() {
|
||||
bug6559589.createGui();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user