yoavs 2004/08/28 05:49:55
Modified: catalina/src/share/org/apache/catalina/core Tag: TOMCAT_5_0
StandardContext.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Addressed Bugzilla 30762. Risky fix I think, but better than the current broken
behavior.
Revision Changes Path
No revision
No revision
1.130.2.1 +9 -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.130
retrieving revision 1.130.2.1
diff -u -r1.130 -r1.130.2.1
--- StandardContext.java 7 Jun 2004 15:30:06 -0000 1.130
+++ StandardContext.java 28 Aug 2004 12:49:54 -0000 1.130.2.1
@@ -4497,7 +4497,11 @@
}
// Stop our application listeners
- listenerStop();
+ // I think this should be after the children are stopped,
+ // because now servlet destroy() is called AFTER
+ // contextDestroyed, which is a Spec violation as noted
+ // Bugzilla 30762.
+ // listenerStop();
// Finalize our character set mapper
setCharsetMapper(null);
@@ -4538,6 +4542,9 @@
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).stop();
}
+
+ // Now stop the listeners, Bugzilla 30762
+ listenerStop();
} finally {
No revision
No revision
1.70.2.11 +4 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.10
retrieving revision 1.70.2.11
diff -u -r1.70.2.10 -r1.70.2.11
--- changelog.xml 24 Aug 2004 12:31:40 -0000 1.70.2.10
+++ changelog.xml 28 Aug 2004 12:49:54 -0000 1.70.2.11
@@ -91,7 +91,10 @@
</fix>
<fix>
<bug>30179</bug>: Improved Bootstrap catalina.properties handling. (yoavs)
- </fix>
+ </fix>
+ <fix>
+ <bug>30762</bug>: Servlet#destroy was called before contextDestroyed.
(yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
