diff options
author | mlapshin <none@none> | 2008-04-14 16:41:00 +0400 |
---|---|---|
committer | mlapshin <none@none> | 2008-04-14 16:41:00 +0400 |
commit | bae564c16677c3e2d00a9de0b46a9813f5d5a409 (patch) | |
tree | bad967032037e7ba6c10f3f50d8cdbe0f4bcd94d | |
parent | 46f2072c2b7b5dd8253c1264526865cc6079a63b (diff) |
6612531: api/javax_swing/ScrollPaneLayout/index.html#xxxLayoutSize (ScrollPaneLayout2024) throws NPE
Summary: Added a check for the NPE
Reviewed-by: alexp
-rw-r--r-- | src/share/classes/javax/swing/ScrollPaneLayout.java | 8 | ||||
-rw-r--r-- | test/javax/swing/JScrollPane/6612531/bug6612531.java | 42 |
2 files changed, 48 insertions, 2 deletions
diff --git a/src/share/classes/javax/swing/ScrollPaneLayout.java b/src/share/classes/javax/swing/ScrollPaneLayout.java index 34aa1cae6..ed769a929 100644 --- a/src/share/classes/javax/swing/ScrollPaneLayout.java +++ b/src/share/classes/javax/swing/ScrollPaneLayout.java @@ -488,10 +488,14 @@ public class ScrollPaneLayout Dimension viewSize = null; Component view = null; - if (viewport != null) { + if (viewport != null) { extentSize = viewport.getPreferredSize(); view = viewport.getView(); - viewSize = view.getPreferredSize(); + if (view != null) { + viewSize = view.getPreferredSize(); + } else { + viewSize = new Dimension(0, 0); + } } /* If there's a viewport add its preferredSize. diff --git a/test/javax/swing/JScrollPane/6612531/bug6612531.java b/test/javax/swing/JScrollPane/6612531/bug6612531.java new file mode 100644 index 000000000..548d3c0f8 --- /dev/null +++ b/test/javax/swing/JScrollPane/6612531/bug6612531.java @@ -0,0 +1,42 @@ +/* + * Copyright 2008 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 + * @bug 6612531 + * @summary Checks that ScrollPaneLayout.preferredLayoutSize() doesn't throw NPE. + * @author Mikhail Lapshin + * @run main bug6612531 + */ + +import javax.swing.*; + +public class bug6612531 { + public static void main(String[] args) { + ScrollPaneLayout c = new ScrollPaneLayout(); + JViewport vp = new JViewport(); + c.addLayoutComponent("VIEWPORT", vp); + c.preferredLayoutSize(new JScrollPane()); + System.out.println("Test passed"); + } +} |