Author: markt
Date: Thu Mar 1 18:34:17 2007
New Revision: 513599
URL: http://svn.apache.org/viewvc?view=rev&rev=513599
Log:
Fix bug 41739. Servlets with a load-on-startup value of zero should be loaded
first.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?view=diff&rev=513599&r1=513598&r2=513599
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Thu Mar 1 18:34:17 2007
@@ -3935,8 +3935,6 @@
int loadOnStartup = wrapper.getLoadOnStartup();
if (loadOnStartup < 0)
continue;
- if (loadOnStartup == 0) // Arbitrarily put them last
- loadOnStartup = Integer.MAX_VALUE;
Integer key = new Integer(loadOnStartup);
ArrayList list = (ArrayList) map.get(key);
if (list == null) {
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=513599&r1=513598&r2=513599
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Mar 1 18:34:17 2007
@@ -30,6 +30,10 @@
<bug>41674</bug> Fix error messages when parsing context.xml that
incorrectly referred to web.xml. (markt)
</fix>
+ <fix>
+ <bug>41739</bug> Correct handling of servlets with a load-on-startup
+ value of zero. These are now the first servlets to be started. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
