Repository: struts Updated Branches: refs/heads/support-2-3 9860ef829 -> ffa6d5cb5
WW-4610 Ports fix from master branch Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ffa6d5cb Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ffa6d5cb Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ffa6d5cb Branch: refs/heads/support-2-3 Commit: ffa6d5cb5b889cce502b1e2e08950c447c53d88e Parents: 9860ef8 Author: Lukasz Lenart <[email protected]> Authored: Thu Mar 3 18:02:38 2016 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Thu Mar 3 18:02:38 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/struts2/dispatcher/ng/PrepareOperations.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/ffa6d5cb/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java index ccf21c7..ebc8925 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java @@ -26,6 +26,7 @@ import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.RequestUtils; +import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.mapper.ActionMapper; @@ -135,6 +136,7 @@ public class PrepareOperations { // 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); }
