Author: markt Date: Mon Jul 20 13:43:45 2009 New Revision: 795838 URL: http://svn.apache.org/viewvc?rev=795838&view=rev Log: resourcePath doesn't end in / so need to use exact match to ensure on WEB-INF/lib gets excluded and not WEB-INF/libxtz
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=795838&r1=795837&r2=795838&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Mon Jul 20 13:43:45 2009 @@ -423,8 +423,8 @@ 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)) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org