Author: markt
Date: Fri Nov  8 13:31:52 2013
New Revision: 1540011

URL: http://svn.apache.org/r1540011
Log:
Don't scan the same TLD more than once

Modified:
    tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java

Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1540011&r1=1540010&r2=1540011&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Fri Nov  8 
13:31:52 2013
@@ -230,6 +230,10 @@ public class TldScanner {
     }
 
     private void parseTld(TldResourcePath path) throws IOException, 
SAXException {
+        if (tldCache.containsKey(path)) {
+            // TLD has already been parsed as a result of processing web.xml
+            return;
+        }
         TaglibXml tld = tldParser.parse(path);
         String uri = tld.getUri();
         if (uri != null) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to