remm 2004/01/27 15:18:19
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Bug 26373: Initialize mapper before load on startup servlets.
Revision Changes Path
1.114 +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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- StandardContext.java 26 Jan 2004 20:19:10 -0000 1.113
+++ StandardContext.java 27 Jan 2004 23:18:19 -0000 1.114
@@ -4252,6 +4252,9 @@
getServletContext().setAttribute
(Globals.RESOURCES_ATTR, getResources());
+ // Initialize associated mapper
+ mapper.setContext(getPath(), welcomeFiles, resources);
+
// Binding thread
oldCCL = bindThread();
@@ -4283,9 +4286,6 @@
// Unbinding thread
unbindThread(oldCCL);
-
- // Initialize associated mapper
- mapper.setContext(getPath(), welcomeFiles, resources);
// Set available status depending upon startup success
if (ok) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
