Author: violetagg
Date: Sun Jul 17 15:02:56 2016
New Revision: 1753080
URL: http://svn.apache.org/viewvc?rev=1753080&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59862
Allow nested jar files scanning to be filtered with the system property
tomcat.util.scan.StandardJarScanFilter.jarsToSkip. Patch is provided by Terence
Bandoian.
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=1753080&r1=1753079&r2=1753080&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Sun
Jul 17 15:02:56 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=1753080&r1=1753079&r2=1753080&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Jul 17 15:02:56 2016
@@ -58,6 +58,12 @@
unexpected initialisation thread and if initilisation is not
thread-safe
the initialisation can then fail. (markt)
</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>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
