craigmcc 01/10/25 19:16:23
Modified: catalina/src/share/org/apache/catalina/core
ContainerBase.java
Log:
Fire the "removeChild" event before setting the child's "parent" property
to null. This way, the event handler can still navigate up the component
hierarchy in order to perform related cleanup activities.
Revision Changes Path
1.15 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ContainerBase.java 2001/07/29 03:43:54 1.14
+++ ContainerBase.java 2001/10/26 02:16:23 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
1.14 2001/07/29 03:43:54 craigmcc Exp $
- * $Revision: 1.14 $
- * $Date: 2001/07/29 03:43:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
1.15 2001/10/26 02:16:23 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/10/26 02:16:23 $
*
* ====================================================================
*
@@ -154,7 +154,7 @@
* class comments of the implementation class.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2001/07/29 03:43:54 $
+ * @version $Revision: 1.15 $ $Date: 2001/10/26 02:16:23 $
*/
public abstract class ContainerBase
@@ -985,8 +985,8 @@
log("ContainerBase.removeChild: stop: ", e);
}
}
- child.setParent(null);
fireContainerEvent(REMOVE_CHILD_EVENT, child);
+ child.setParent(null);
}
}
