From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Jul 2009 13:20:07 +0000 (+0000)
Subject: Add a note about keeping processing order in sync.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0f0c2012fa48c184cda7f7f7ee8fef87e6ddd95f;p=tomcat7.0

Add a note about keeping processing order in sync.

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

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 21416c53a..cf89fefaa 100644
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -323,6 +323,8 @@ public final class TldConfig  implements LifecycleListener {
          * 2. web.xml entries
          * 3. JARS in WEB-INF/lib & TLDs under WEB-INF (equal priority)
          * 4. Additional entries from the container
+         * 
+         * Keep processing order in sync with o.a.j.compiler.TldLocationsCache
          */
         
         // Stage 2 - web.xml entries
diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java b/java/org/apache/jasper/compiler/TldLocationsCache.java
index 74622a300..d01d59e4e 100644
--- a/java/org/apache/jasper/compiler/TldLocationsCache.java
+++ b/java/org/apache/jasper/compiler/TldLocationsCache.java
@@ -238,6 +238,9 @@ public class TldLocationsCache {
         }
     }
 
+    /*
+     * Keep processing order in sync with o.a.c.startup.TldConfig
+     */
     private void init() throws JasperException {
         if (initialized) return;
         try {