This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 511ec62105bc64374e8246aa8367379af66af0b3 Merge: 4c8cc361d 864f51336 Author: Lukasz Lenart <[email protected]> AuthorDate: Sun Oct 16 08:52:07 2022 +0200 Merge pull request #611 from apache/WW-5241-exec-and-wait [WW-5241] Fixes issue with includeParams=all when using exec & wait apps/showcase/src/main/resources/struts-wait.xml | 4 + .../src/main/webapp/WEB-INF/decorators/main.jsp | 2 +- .../src/main/webapp/WEB-INF/wait/complete.jsp | 29 ++--- .../src/main/webapp/WEB-INF/wait/index.jsp | 53 ++++++++ .../showcase/src/main/webapp/WEB-INF/wait/wait.jsp | 68 ++++------ apps/showcase/src/main/webapp/wait/index.html | 53 -------- .../dispatcher/mapper/DefaultActionMapper.java | 37 ++++-- .../dispatcher/mapper/DefaultActionMapperTest.java | 137 ++++++++++++++++++++- .../apache/struts2/result/PostbackResultTest.java | 5 +- .../result/ServletActionRedirectResultTest.java | 7 +- .../struts2/views/jsp/AbstractUITagTest.java | 6 +- 11 files changed, 268 insertions(+), 133 deletions(-)
