diff options
Diffstat (limited to 'src/share/classes/javax/swing')
| -rw-r--r-- | src/share/classes/javax/swing/ScrollPaneLayout.java | 8 |
1 files changed, 6 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. |