22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
|
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
|
||
|
|
index a217571..992eb88 100644
|
||
|
|
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
|
||
|
|
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
|
||
|
|
@@ -269,6 +269,7 @@ public class StandardJarScanner implements JarScanner {
|
||
|
|
log.debug(sm.getString("jarScan.classloaderJarScan", url));
|
||
|
|
}
|
||
|
|
try {
|
||
|
|
+ processedURLs.add(url);
|
||
|
|
process(scanType, callback, url, null, isWebapp, classPathUrlsToProcess);
|
||
|
|
} catch (IOException ioe) {
|
||
|
|
log.warn(sm.getString("jarScan.classloaderFail", url), ioe);
|
||
|
|
@@ -412,7 +413,7 @@ public class StandardJarScanner implements JarScanner {
|
||
|
|
|
||
|
|
public ClassPathEntry(URL url) {
|
||
|
|
String path = url.getPath();
|
||
|
|
- int end = path.indexOf(Constants.JAR_EXT);
|
||
|
|
+ int end = path.lastIndexOf(Constants.JAR_EXT);
|
||
|
|
if (end != -1) {
|
||
|
|
jar = true;
|
||
|
|
int start = path.lastIndexOf('/', end);
|