This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 93f378809cc73c65c1d689a0e32ec440c52e7ce2
Merge: 49a4d6d ed3323c
Author: Yasser Zamani <yasserzam...@apache.org>
AuthorDate: Fri Mar 26 13:50:30 2021 +0430
Merge pull request #480 from apache/WW-5117-reorders-stack
[WW-5117] Keeps Action always on top of the ValueStack
.../template/FreemarkerTemplateEngine.java | 17 +++++--
.../template/simple/dynamic-attributes.ftl | 2 +-
.../test/java/org/apache/struts2/TestAction.java | 12 ++++-
.../apache/struts2/views/jsp/ui/HiddenTest.java | 55 +++++++++++++++++++---
.../org/apache/struts2/views/jsp/ui/Hidden-3.txt | 5 ++
5 files changed, 79 insertions(+), 12 deletions(-)
