markt 2004/03/16 16:11:30
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Fix bug 14228
- Load on startup servlets should be loaded after AFTER_START_EVENT
(where environment entries are created).
Revision Changes Path
1.119 +8 -6
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.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- StandardContext.java 16 Mar 2004 22:18:35 -0000 1.118
+++ StandardContext.java 17 Mar 2004 00:11:30 -0000 1.119
@@ -4252,11 +4252,6 @@
}
}
- // Load and initialize all "load on startup" servlets
- if (ok) {
- loadOnStartup(findChildren());
- }
-
// Unbinding thread
unbindThread(oldCCL);
@@ -4291,6 +4286,13 @@
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]
