From cb5997490396e1d55b37e233da532452810c0ce2 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 27 Jun 2022 09:44:51 +0200
Subject: [PATCH] WW-5190 Marks all Struts related filters with
 <async-supported/>

---
 apps/showcase/src/main/webapp/WEB-INF/web.xml                   | 2 ++
 .../it/org/apache/struts2/showcase/DispatcherResultTest.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml
index 5f65b7985..1bcfa4184 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -42,11 +42,13 @@
     <filter>
         <filter-name>struts-execute</filter-name>
         <filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
+        <async-supported>true</async-supported>
     </filter>
 
     <filter>
         <filter-name>sitemesh</filter-name>
         <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
+        <async-supported>true</async-supported>
     </filter>
 
     <filter-mapping>
diff --git a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java
index 48163cea3..6564270c2 100644
--- a/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java
+++ b/apps/showcase/src/test/java/it/org/apache/struts2/showcase/DispatcherResultTest.java
@@ -40,6 +40,7 @@ public class DispatcherResultTest {
     @Test
     public void testDispatchingToAction() throws Exception {
         try (final WebClient webClient = new WebClient()) {
+            webClient.getOptions().setThrowExceptionOnFailingStatusCode(false);
             final HtmlPage page = webClient.getPage(ParameterUtils.getBaseUrl() + "/dispatcher/forward.action");
 
             //DomElement div = page.getElementById("dispatcher-result");