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 929a60184bfc0d718cb3880bd49e1a75e3c2c294 Merge: c6d13f101 ed0c7287d Author: Kusal Kithul-Godage <g...@kusal.io> AuthorDate: Thu Apr 11 14:27:31 2024 +1000 Merge pull request #910 from apache/WW-5406-excluded-patterns WW-5406 Ensure Action excluded patterns are reinjected .../org/apache/struts2/dispatcher/Dispatcher.java | 29 ++++++++ .../apache/struts2/dispatcher/InitOperations.java | 25 +------ .../struts2/dispatcher/PrepareOperations.java | 18 +++-- .../filter/StrutsPrepareAndExecuteFilter.java | 10 ++- .../dispatcher/filter/StrutsPrepareFilter.java | 10 ++- .../apache/struts2/dispatcher/DispatcherTest.java | 26 +++++++ .../struts2/dispatcher/InitOperationsTest.java | 86 ---------------------- ...rutsPrepareAndExecuteFilterIntegrationTest.java | 13 +--- 8 files changed, 86 insertions(+), 131 deletions(-)