You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ku...@apache.org on 2024/07/13 14:29:01 UTC
(struts) 03/03: Merge branch 'refs/heads/kusal-experimental' into kusal-experimental-2
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch kusal-experimental-2
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 076d5acc1f62327068afab15868e8da154fd2faa
Merge: 9267ce638 d71bcb5af
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Sun Jul 14 00:28:20 2024 +1000
Merge branch 'refs/heads/kusal-experimental' into kusal-experimental-2
# Conflicts:
# core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
.../xwork2/config/providers/XmlDocConfigurationProvider.java | 12 ++++++------
.../src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 11 +----------
.../com/opensymphony/xwork2/ognl/SecurityMemberAccess.java | 6 ++++++
3 files changed, 13 insertions(+), 16 deletions(-)
diff --cc core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
index fbdcb47de,5c1d1f395..53baf52db
--- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
@@@ -148,7 -149,10 +148,8 @@@ public abstract class XmlDocConfigurati
protected Class<?> allowAndLoadClass(String className) throws ClassNotFoundException {
Class<?> clazz = loadClass(className);
- allowlistClasses.add(clazz);
- allowlistClasses.addAll(ClassUtils.getAllSuperclasses(clazz));
- allowlistClasses.addAll(ClassUtils.getAllInterfaces(clazz));
+ allowlistClasses.addAll(ConfigurationUtil.getAllClassTypes(clazz));
+ providerAllowlist.registerAllowlist(this, allowlistClasses);
return clazz;
}