markt 2004/03/16 16:00:21
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
Fix bug 13833
- StandardContext.Start() should throw an exception if it fails.
Fix bug 14228
- Load on startup servlets should be loaded after AFTER_START_EVENT
(where environment entries are created).
Revision Changes Path
1.124 +9 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- StandardContext.java 16 Mar 2004 23:23:33 -0000 1.123
+++ StandardContext.java 17 Mar 2004 00:00:21 -0000 1.124
@@ -3606,10 +3606,6 @@
ok = false;
}
- // Load and initialize all "load on startup" servlets
- if (ok)
- loadOnStartup(findChildren());
-
// Unbinding thread
unbindThread(oldCCL);
@@ -3626,11 +3622,16 @@
log(sm.getString("standardContext.startCleanup"), t);
}
setAvailable(false);
+ throw new
LifecycleException(sm.getString("standardContext.startFailed"));
}
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null);
+ // Load and initialize all "load on startup" servlets
+ oldCCL = bindThread();
+ loadOnStartup(findChildren());
+ unbindThread(oldCCL);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
