remm 2004/03/22 04:45:55
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- It is better to call after start a little bt earlier. The last patch was causing
some
regressions, and was not addressing the issue.
Revision Changes Path
1.120 +11 -13
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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- StandardContext.java 17 Mar 2004 00:11:30 -0000 1.119
+++ StandardContext.java 22 Mar 2004 12:45:55 -0000 1.120
@@ -4238,6 +4238,11 @@
postWelcomeFiles();
}
+ if (ok) {
+ // Notify our interested LifecycleListeners
+ lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null);
+ }
+
// Configure and call application event listeners and filters
if (ok) {
if (!listenerStart()) {
@@ -4252,6 +4257,11 @@
}
}
+ // Load and initialize all "load on startup" servlets
+ if (ok) {
+ loadOnStartup(findChildren());
+ }
+
// Unbinding thread
unbindThread(oldCCL);
@@ -4273,11 +4283,6 @@
// JMX registration
registerJMX();
- if (ok) {
- // Notify our interested LifecycleListeners
- lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null);
- }
-
startTime=System.currentTimeMillis();
// Send j2ee.state.running notification
@@ -4286,13 +4291,6 @@
new Notification("j2ee.state.running", this.getObjectName(),
sequenceNumber++);
broadcaster.sendNotification(notification);
- }
-
- // Load and initialize all "load on startup" servlets
- if (ok) {
- oldCCL = bindThread();
- loadOnStartup(findChildren());
- unbindThread(oldCCL);
}
// Close all JARs right away to avoid always opening a peak number
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
