From 0c92e2a1f361b6675ed8ac2c7bc3ffe06603f01a Mon Sep 17 00:00:00 2001 From: victorsosa Date: Thu, 3 Mar 2016 10:06:57 -0400 Subject: [PATCH] fix for WW-4610 ServletActionContext.getRequest() doesn't return the MultiPartRequestWrapper (or StrutsRequestWrapper) when using StrutsPrepareFilter --- .../java/org/apache/struts2/dispatcher/PrepareOperations.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java index 547997b395..efa4ea74ba 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java @@ -26,6 +26,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.RequestUtils; +import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; @@ -145,6 +146,7 @@ public HttpServletRequest wrapRequest(HttpServletRequest oldRequest) throws Serv // Wrap request first, just in case it is multipart/form-data // parameters might not be accessible through before encoding (ww-1278) request = dispatcher.wrapRequest(request); + ServletActionContext.setRequest(request); } catch (IOException e) { throw new ServletException("Could not wrap servlet request with MultipartRequestWrapper!", e); }