Author: markt
Date: Thu Mar 1 18:38:26 2007
New Revision: 513601
URL: http://svn.apache.org/viewvc?view=rev&rev=513601
Log:
Port fix for bug 41739. Servlets with a load-on-startup value of zero should be
loaded first.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?view=diff&rev=513601&r1=513600&r2=513601
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Mar 1 18:38:26 2007
@@ -4021,8 +4021,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=513601&r1=513600&r2=513601
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Mar 1 18:38:26 2007
@@ -25,6 +25,10 @@
when the serviet is reading/writing from the input/output streams
The flag is
<code>-Dorg.apache.tomcat.util.net.NioSelectorShared=true</code>
</update>
+ <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="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
