From 17a997cfe3198526c554ca69360059b61ca4818f Mon Sep 17 00:00:00 2001
From: Lana Steuck <lana@openjdk.org>
Date: Mon, 7 Jun 2010 15:35:36 -0700
Subject: [PATCH] 6888130: SwingSet2: Demo is not launching and throwing NPE

Reviewed-by: prr
---
 .../classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index 208790270a3..0e9e23caff4 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -3527,7 +3527,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants {
                 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);