Index: modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java (revision 495290) +++ modules/swing/src/main/java/common/javax/swing/ScrollPaneLayout.java (working copy) @@ -170,9 +170,6 @@ public Dimension preferredLayoutSize(final Container parent) { JScrollPane pane = (JScrollPane)parent; - if (pane == null) { - return new Dimension(0, 0); - } int rowHeadWidth = (rowHead == null) ? 0 : rowHead.getPreferredSize().width; int viewportWidth = (viewport == null) ? 0 : viewport.getPreferredSize().width; int viewportBorderLeft = (pane.getViewportBorder() == null) ? 0 : pane.getViewportBorder().getBorderInsets(pane).left;