This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new be649bc Check that scan set is empty as it is more accurate
be649bc is described below
commit be649bcbb67d6d0bf1fb107e88cc8274fe0eb85e
Author: remm <[email protected]>
AuthorDate: Mon Mar 23 13:49:03 2020 +0100
Check that scan set is empty as it is more accurate
Credit for a PR I had missed from Iridias.
---
java/org/apache/tomcat/util/scan/StandardJarScanFilter.java | 2 +-
webapps/docs/changelog.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
b/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
index 280f21b..1451de4 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
@@ -43,8 +43,8 @@ public class StandardJarScanFilter implements JarScanFilter {
defaultSkip = System.getProperty(Constants.SKIP_JARS_PROPERTY);
populateSetFromAttribute(defaultSkip, defaultSkipSet);
defaultScan = System.getProperty(Constants.SCAN_JARS_PROPERTY);
- defaultSkipAll = (defaultSkipSet.contains("*") ||
defaultSkipSet.contains("*.jar")) && defaultScan == null;
populateSetFromAttribute(defaultScan, defaultScanSet);
+ defaultSkipAll = (defaultSkipSet.contains("*") ||
defaultSkipSet.contains("*.jar")) && defaultScanSet.isEmpty();
}
private String tldSkip;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b90111b..cc6269d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -63,7 +63,8 @@
</fix>
<fix>
<bug>64247</bug>: Using a wildcard for <code>jarsToSkip</code> should
- not override a possibly present <code>jarsToScan</code>. (remm)
+ not override a possibly present <code>jarsToScan</code>. Based on code
+ submitted by Iridias. (remm)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
