remm 2003/07/02 15:00:39
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Small code cleanup.
- Initialize mapper after the main start so that welcome files are correctly set.
Revision Changes Path
1.69 +13 -10
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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- StandardContext.java 24 Jun 2003 21:36:49 -0000 1.68
+++ StandardContext.java 2 Jul 2003 22:00:34 -0000 1.69
@@ -4007,9 +4007,6 @@
if ((resources != null) && (resources instanceof Lifecycle))
((Lifecycle) resources).start();
- // Initialize associated mapper
- mapper.setContext(getPath(), welcomeFiles, resources);
-
// Set JMX object name for proper pipeline registration
preRegisterJMX();
@@ -4026,12 +4023,13 @@
((Lifecycle) pipeline).start();
// Read tldListeners. XXX Option to disable
- TldConfig tldConfig=new TldConfig();
- tldConfig.setContext( this );
+ TldConfig tldConfig = new TldConfig();
+ tldConfig.setContext(this);
try {
tldConfig.execute();
- } catch( Exception ex ) {
- log.error("Error reading tld listeners " + ex.toString(), ex);
+ } catch (Exception ex) {
+ log.error("Error reading tld listeners "
+ + ex.toString(), ex);
//ok=false;
}
@@ -4096,16 +4094,21 @@
// Create request listener lifecycle valve
if (ok) {
if (!requestListenerConfig()) {
-
log.error(sm.getString("standardContext.requestListenerStartFailed"));
+ log.error(sm.getString
+ ("standardContext.requestListenerStartFailed"));
}
}
// Load and initialize all "load on startup" servlets
- if (ok)
+ if (ok) {
loadOnStartup(findChildren());
+ }
// 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]
