This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 20380e1 BZ64247: Fix jarsToSkip wildcard use
20380e1 is described below
commit 20380e1cfc94d0c49e0571548720365ed65e859a
Author: remm <r...@apache.org>
AuthorDate: Fri Mar 20 14:46:01 2020 +0100
BZ64247: Fix jarsToSkip wildcard use
Using a wildcard for jarsToSkip should not override a possibly present
jarsToScan. At some point using self overriding settings becomes
questionable, but jarsToScan should take precedence. To fully disable
scanning, jarsToSkip should be set to * and jarsToScan shouldn't be set.
---
java/org/apache/tomcat/util/scan/StandardJarScanFilter.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
b/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
index 65389d9..9167e1f 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
@@ -42,8 +42,8 @@ public class StandardJarScanFilter implements JarScanFilter {
// Initialize defaults. There are no setter methods for them.
defaultSkip = System.getProperty(Constants.SKIP_JARS_PROPERTY);
populateSetFromAttribute(defaultSkip, defaultSkipSet);
- defaultSkipAll = defaultSkipSet.contains("*") ||
defaultSkipSet.contains("*.jar");
defaultScan = System.getProperty(Constants.SCAN_JARS_PROPERTY);
+ defaultSkipAll = (defaultSkipSet.contains("*") ||
defaultSkipSet.contains("*.jar")) && defaultScan == null;
populateSetFromAttribute(defaultScan, defaultScanSet);
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 95686dc..948bd13 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -61,6 +61,10 @@
<bug>64226</bug>: Reset timezone after parsing a date since the date
format is reused. Test case submitted by Gary Thomas. (remm)
</fix>
+ <fix>
+ <bug>64247</bug>: Using a wildcard for <code>jarsToSkip</code> should
+ not override a possibly present <code>jarsToScan</code>. (remm)
+ </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
