From c32895294a158c0f4751ebaeb3b760a6c0ba4aae Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 2 Mar 2007 02:38:26 +0000
Subject: [PATCH] Port fix for bug 41739. Servlets with a load-on-startup value
 of zero should be loaded first.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@513601 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardContext.java | 2 --
 webapps/docs/changelog.xml                         | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index e645f9564..78c94b65d 100644
--- 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 b7d67b7ca..f2fd170b4 100644
--- 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">
-- 
2.11.0