This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 1e2517b59ecb4f401962c696f32e82e4400d67d1
Merge: 8d6ecee84 be82a7240
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sun Nov 3 21:06:59 2024 +1100
Merge pull request #1117 from apache/WW-3714-overriding-behaviour
WW-3714 Ensure correct delegation of deprecated API methods
.../com/opensymphony/xwork2/DefaultActionInvocation.java | 8 ++++----
.../xwork2/interceptor/AbstractInterceptor.java | 7 ++++++-
.../java/org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
.../interceptor/TokenSessionStoreInterceptor.java | 16 ++++++++--------
.../org/apache/struts2/rest/RestActionInvocation.java | 4 ++--
5 files changed, 21 insertions(+), 16 deletions(-)
