remm 2005/03/15 05:06:31
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java
webapps/docs changelog.xml
Log:
- Changelog update.
- 34016: compatibility of antiResourceLocking with the admin webapp.
Revision Changes Path
1.63 +13 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ContextConfig.java 14 Feb 2005 19:27:41 -0000 1.62
+++ ContextConfig.java 15 Mar 2005 13:06:30 -0000 1.63
@@ -255,7 +255,19 @@
start();
} else if
(event.getType().equals(StandardContext.BEFORE_START_EVENT)) {
beforeStart();
+ } else if
(event.getType().equals(StandardContext.AFTER_START_EVENT)) {
+ // Restore docBase for management tools
+ if (originalDocBase != null) {
+ String docBase = context.getDocBase();
+ context.setDocBase(originalDocBase);
+ originalDocBase = docBase;
+ }
} else if (event.getType().equals(Lifecycle.STOP_EVENT)) {
+ if (originalDocBase != null) {
+ String docBase = context.getDocBase();
+ context.setDocBase(originalDocBase);
+ originalDocBase = docBase;
+ }
stop();
} else if (event.getType().equals(Lifecycle.INIT_EVENT)) {
init();
1.244 +21 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- changelog.xml 14 Mar 2005 21:46:51 -0000 1.243
+++ changelog.xml 15 Mar 2005 13:06:31 -0000 1.244
@@ -69,15 +69,35 @@
<fix>
Fix logger names for wrappers (remm)
</fix>
+ <fix>
+ <bug>34006</bug>: If antiResourceLocking was used, HostConfig
considered the path as external,
+ and web application resources were not correctly removed or tacked;
also simplify the code a lot
+ (remm)
+ </fix>
+ <fix>
+ <bug>34016</bug>: Save and restore docBase when using
antiResourceLocking, for compatibility with
+ the admin webapp (remm)
+ </fix>
</changelog>
</subsection>
+
<subsection name="Coyote">
<changelog>
<fix>
<bug>33971</bug>: Set remoteHost to null when Apache doesn't send
one. (billbarker)
</fix>
+ <fix>
+ Fix calculation of threadRatio for the ms thread pool, and fix
setting the updated
+ timeout value (remm)
+ </fix>
+ <update>
+ Update the ms thread pool so that we allocate a worker before
accepting a new socket,
+ and wait a little if the pool is exhausted; this should make low
maxThreads values work a
+ lot better (remm)
+ </update>
</changelog>
</subsection>
+
<subsection name="Cluster">
<changelog>
<fix>
@@ -91,6 +111,7 @@
no queue thread lock contention under high replication load,
submitted by Rainer Jung (pero)
</add>
+ </changelog>
</subsection>
<subsection name="Webapps">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
