resourcePath doesn't end in / so need to use exact match to ensure on WEB-INF/lib...

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

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index cf89fef..c5fc9cc 100644 (file)
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -423,8 +423,8 @@ public final class TldConfig  implements LifecycleListener {
                 NameClassPair item = items.nextElement();
                 String resourcePath = rootPath + item.getName();
                 if (!resourcePath.endsWith(TLD_EXT)
-                        && (resourcePath.startsWith("/WEB-INF/classes/")
-                            || resourcePath.startsWith("/WEB-INF/lib/"))) {
+                        && (resourcePath.equals("/WEB-INF/classes")
+                            || resourcePath.equals("/WEB-INF/lib"))) {
                     continue;
                 }
                 if (resourcePath.endsWith(TLD_EXT)) {