--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Tue Jun 01 21:36:00 2010 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Mon Jun 07 15:35:36 2010 -0700
@@ -3527,7 +3527,9 @@
Integer index = (Integer) e.getNewValue();
// remove the current index
// to let updateHtmlViews() insert the correct one
- htmlViews.removeElementAt(index);
+ if (htmlViews != null) {
+ htmlViews.removeElementAt(index);
+ }
updateHtmlViews(index);
} else if (name == "tabLayoutPolicy") {
BasicTabbedPaneUI.this.uninstallUI(pane);