Author: markt
Date: Fri Jun 14 07:38:41 2013
New Revision: 1492974
URL: http://svn.apache.org/r1492974
Log:
Already skipped WEB-INF/lib so no need to skip those JARs again
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1492974&r1=1492973&r2=1492974&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Fri
Jun 14 07:38:41 2013
@@ -227,12 +227,9 @@ public class StandardJarScanner implemen
// Extract the jarName if there is one to be found
String jarName = getJarName(urls[i]);
- // Skip JARs known not to be interesting and JARs
- // in WEB-INF/lib we have already scanned
- if (jarName != null &&
- !(Matcher.matchPath(ignoredJarsTokens, jarName) ||
- urls[i].toString().contains(
- Constants.WEB_INF_LIB + jarName))) {
+ // Skip JARs known not to be interesting
+ if (jarName != null && !Matcher.matchPath(
+ ignoredJarsTokens, jarName)) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("jarScan.classloaderJarScan", urls[i]));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
