remm 2003/03/12 13:32:50
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- If init needs guards against being invoked twice, this also needs it.
- Any explanation why, BTW ?
Revision Changes Path
1.26 +4 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StandardContext.java 12 Mar 2003 06:24:15 -0000 1.25
+++ StandardContext.java 12 Mar 2003 21:32:49 -0000 1.26
@@ -4780,7 +4780,9 @@
if( started ) {
stop();
}
- parent.removeChild(this);
+ if (parent != null) {
+ parent.removeChild(this);
+ }
}
public void create() throws Exception{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
