# HG changeset patch
# User lana
# Date 1275950136 25200
# Node ID 9606922fdd90fb096979a6e3f939280e0f37e15c
# Parent  41a5aa28250e89d15791438070b3d6e9b8cb2dce
6888130: SwingSet2: Demo is not launching and throwing NPE.
Reviewed-by: prr

diff -r 41a5aa28250e -r 9606922fdd90 jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
--- 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);