This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from 49a4d6d Merge pull request #478 from
davoustp/contention-in-singleton-injection-2.6.x
add ed3323c WW-5117 Keeps Action always on top of the ValueStack
new 93f3788 Merge pull request #480 from apache/WW-5117-reorders-stack
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
create mode 100644
core/src/test/resources/org/apache/struts2/views/jsp/ui/Hidden-3.txt
