Index: javax/swing/JTable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTable.java,v
retrieving revision 1.47
diff -u -r1.47 JTable.java
--- javax/swing/JTable.java	20 Sep 2005 14:46:18 -0000	1.47
+++ javax/swing/JTable.java	21 Sep 2005 18:53:09 -0000
@@ -1983,7 +1983,8 @@
     int average = spill / cols.length;
     for (int i = 0; i < cols.length; i++)
       {
-        cols[i].setWidth(cols[i].getWidth() + average);
+        if (cols[i] != null)
+          cols[i].setWidth(cols[i].getWidth() + average);
       }
   }
 
Index: javax/swing/ToolTipManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ToolTipManager.java,v
retrieving revision 1.17
diff -u -r1.17 ToolTipManager.java
--- javax/swing/ToolTipManager.java	21 Sep 2005 14:22:21 -0000	1.17
+++ javax/swing/ToolTipManager.java	21 Sep 2005 18:53:09 -0000
@@ -421,13 +421,6 @@
 	insideTimer.stop();
 	hideTip();
       }
-    
-    if (currentComponent == null)
-  	  currentComponent = (Component) event.getSource();
-    
-    currentComponent.invalidate();
-    currentComponent.validate();
-    currentComponent.repaint();
   }
 
   /**
@@ -511,8 +504,6 @@
         pane.add(containerPanel);
         containerPanel.setBounds(p.x, p.y, dims.width, dims.height);
         currentTip.setBounds(0, 0, dims.width, dims.height);
-        pane.revalidate();
-        pane.repaint();
       }
     else if (currentComponent.isShowing())
       {
@@ -546,9 +537,6 @@
 	if (parent == null)
 	  return;
 	parent.remove(containerPanel);
-	parent.invalidate();
-	parent.validate();
-	parent.repaint();
 
 	parent = currentTip.getParent();
 	if (parent == null)