yoavs 2004/08/28 16:57:02
Modified: catalina/src/share/org/apache/catalina/core Tag: TOMCAT_5_0
StandardContext.java
Log:
Making fix to 30762 safer: listener stop must come before loader stop.
Revision Changes Path
No revision
No revision
1.130.2.2 +4 -4
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.2.1
retrieving revision 1.130.2.2
diff -u -r1.130.2.1 -r1.130.2.2
--- StandardContext.java 28 Aug 2004 12:49:54 -0000 1.130.2.1
+++ StandardContext.java 28 Aug 2004 23:57:02 -0000 1.130.2.2
@@ -4527,6 +4527,9 @@
((Lifecycle) children[i]).stop();
}
+ // Now stop the listeners, Bugzilla 30762
+ listenerStop();
+
// Stop resources
resourcesStop();
@@ -4542,9 +4545,6 @@
if ((loader != null) && (loader instanceof Lifecycle)) {
((Lifecycle) loader).stop();
}
-
- // Now stop the listeners, Bugzilla 30762
- listenerStop();
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
