Author: markt
Date: Thu Oct 10 12:28:57 2013
New Revision: 1530937
URL: http://svn.apache.org/r1530937
Log:
Restore Tomcat 7 behaviour of skipping TLDs located directly in WEB-INF/classes
or WEB-INF/lib
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=1530937&r1=1530936&r2=1530937&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Thu Oct 10
12:28:57 2013
@@ -185,7 +185,11 @@ public class TldScanner {
Set<String> dirList = context.getResourcePaths(startPath);
if (dirList != null) {
for (String path : dirList) {
- if (path.endsWith("/")) {
+ if (path.startsWith("/WEB-INF/classes/")) {
+ // Skip: JSP.7.3.1
+ } else if (path.startsWith("/WEB-INF/lib/")) {
+ // Skip: JSP.7.3.1
+ } else if (path.endsWith("/")) {
scanResourcePaths(path);
} else if (path.startsWith("/WEB-INF/tags/")) {
// JSP 7.3.1: in /WEB-INF/tags only consider implicit.tld
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
