Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5270 Struts exclusion flag fix when forwarding

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2022-12-19 17:04:33 +11:00
parent 6ea67a6d64
commit 92c0103b38
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class StrutsExecuteFilter implements StrutsStatics, Filter {
}
private boolean excludeUrl(HttpServletRequest request) {
return request.getAttribute(StrutsPrepareFilter.REQUEST_EXCLUDED_FROM_ACTION_MAPPING) != null;
return Boolean.TRUE.equals(request.getAttribute(StrutsPrepareFilter.REQUEST_EXCLUDED_FROM_ACTION_MAPPING));
}
public void destroy() {
core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java
+2 -1
View File
@@ -80,8 +80,9 @@ public class StrutsPrepareFilter implements StrutsStatics, Filter {
try {
if (excludedPatterns != null && prepare.isUrlExcluded(request, excludedPatterns)) {
request.setAttribute(REQUEST_EXCLUDED_FROM_ACTION_MAPPING, new Object());
request.setAttribute(REQUEST_EXCLUDED_FROM_ACTION_MAPPING, true);
} else {
request.setAttribute(REQUEST_EXCLUDED_FROM_ACTION_MAPPING, false);
prepare.setEncodingAndLocale(request, response);
prepare.createActionContext(request, response);
prepare.assignDispatcherToThread();