diff --git a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java index 0e479c449..eeaf3abb9 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsExecuteFilter.java @@ -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() { diff --git a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java index b35d6cb10..e8a446cca 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/filter/StrutsPrepareFilter.java @@ -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();