1 files changed, 4 insertions, 3 deletions
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index a8f52cef617..5b1e1ff0f60 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -451,6 +451,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
             }
         }
       runCount = runs;
+      if (runCount > tabRuns.length)
+        expandTabRunsArray();
 
       tabRuns[0] = 0;
       normalizeTabRuns(tabPlacement, tabCount, start, max);
@@ -1025,6 +1027,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
             }
         }
       runCount = runs;
+      if (runCount > tabRuns.length)
+        expandTabRunsArray();
 
       padSelectedTab(tabPlacement, tabPane.getSelectedIndex());
     }
@@ -1733,9 +1737,6 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     int tabCount = tabPane.getTabCount();
     int currRun = 1;
     
-    if (tabCount > runCount)
-      runCount = tabCount;
-    
     if (tabCount < 1)
       return;