This is an automated email from the ASF dual-hosted git repository.
markt 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 cf67739 PropertySourceSecure -> SecurePropertySource as per Felix's
review
cf67739 is described below
commit cf677393f718274d6612f739bbc58d8e4b9feda1
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Sep 16 09:07:14 2019 +0100
PropertySourceSecure -> SecurePropertySource as per Felix's review
---
java/org/apache/tomcat/util/IntrospectionUtils.java | 8 ++++----
java/org/apache/tomcat/util/digester/Digester.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index f6ac737..71d9504 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -277,8 +277,8 @@ public final class IntrospectionUtils {
}
if (v == null && dynamicProp != null) {
for (PropertySource propertySource : dynamicProp) {
- if (propertySource instanceof PropertySourceSecure) {
- v = ((PropertySourceSecure)
propertySource).getProperty(n, classLoader);
+ if (propertySource instanceof SecurePropertySource) {
+ v = ((SecurePropertySource)
propertySource).getProperty(n, classLoader);
} else {
v = propertySource.getProperty(n);
}
@@ -503,7 +503,7 @@ public final class IntrospectionUtils {
}
- public static interface PropertySourceSecure extends PropertySource {
+ public static interface SecurePropertySource extends PropertySource {
/**
* Obtain a property value, checking that code associated with the
@@ -513,7 +513,7 @@ public final class IntrospectionUtils {
* looked up <b>without</b> a call to
* {@link PermissionCheck#check(java.security.Permission)}
*
- * @param key The key of the requested property
+ * @param key The key of the requested property
* @param classLoader The class loader associated with the code that
* trigger the property lookup
* @return The property value or {@code null} if it could not be found
diff --git a/java/org/apache/tomcat/util/digester/Digester.java
b/java/org/apache/tomcat/util/digester/Digester.java
index 610e83c..59a347b 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -123,7 +123,7 @@ public class Digester extends DefaultHandler2 {
// --------------------------------------------------- Instance Variables
- private static class SystemPropertySource implements
IntrospectionUtils.PropertySourceSecure {
+ private static class SystemPropertySource implements
IntrospectionUtils.SecurePropertySource {
@Override
public String getProperty(String key) {
@@ -144,7 +144,7 @@ public class Digester extends DefaultHandler2 {
}
- public static class EnvironmentPropertySource implements
IntrospectionUtils.PropertySourceSecure {
+ public static class EnvironmentPropertySource implements
IntrospectionUtils.SecurePropertySource {
@Override
public String getProperty(String key) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
