Index: java/awt/Container.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.64
diff -u -r1.64 Container.java
--- java/awt/Container.java	12 Sep 2005 14:19:26 -0000	1.64
+++ java/awt/Container.java	16 Sep 2005 14:24:47 -0000
@@ -38,6 +38,7 @@
 
 package java.awt;
 
+import java.awt.event.ComponentListener;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
 import java.awt.event.KeyEvent;
@@ -419,6 +420,10 @@
       {
         Component r = component[index];
 
+        ComponentListener[] list = r.getComponentListeners();
+        for (int j = 0; j < list.length; j++)
+              r.removeComponentListener(list[j]);
+        
         r.removeNotify();
 
         System.arraycopy(component, index + 1, component, index,