Port fix for bug 41739. Servlets with a load-on-startup value of zero should be loade...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@513601 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index e645f95..78c94b6 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4021,8 +4021,6 @@ public class StandardContext
             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) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b7d67b7..f2fd170 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">