This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 31c3fc50ed55d24a5dd2898f7cfa7c0810d3ab15
Merge: adcd1df0c 3c856c92a
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Feb 17 17:10:48 2025 +1100
Merge pull request #1214 from apache/WW-5525-proxyutil-npe
WW-5525 Fix NPE in ProxyUtil for SecurityMemberAccess originating static
members
.../apache/struts2/ognl/SecurityMemberAccess.java | 17 ++++----
.../java/org/apache/struts2/util/ProxyUtil.java | 9 +++--
.../apache/struts2/ognl/OgnlValueStackTest.java | 47 +++++++++++++++++-----
.../apache/struts2/spring/SpringProxyUtilTest.java | 4 +-
4 files changed, 55 insertions(+), 22 deletions(-)
