Author: markt
Date: Thu Aug 11 21:43:59 2016
New Revision: 1756052
URL: http://svn.apache.org/viewvc?rev=1756052&view=rev
Log:
Restore r1753080
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/trunk/webapps/docs/changelog.xml
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=1756052&r1=1756051&r2=1756052&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Thu
Aug 11 21:43:59 2016
@@ -417,7 +417,7 @@ public class StandardJarScanner implemen
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);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1756052&r1=1756051&r2=1756052&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug 11 21:43:59 2016
@@ -97,6 +97,12 @@
Coty Sutherland. (fschumacher)
</fix>
<fix>
+ <bug>59862</bug>: Allow nested jar files scanning to be filtered with
+ the system property
+ <code>tomcat.util.scan.StandardJarScanFilter.jarsToSkip</code>. Patch
+ is provided by Terence Bandoian. (violetagg)
+ </fix>
+ <fix>
<bug>59866</bug>: When scanning <code>WEB-INF/classes</code> for
annotations, don't scan the contents of
<code>WEB-INF/classes/META-INF</code> (if present) since classes will
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
