WW-4467 disableRequestAttributeValueStackLookup applied

to MultiPartRequestWrapper

Author: lukaszlenart

core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

@@ -835,7 +835,7 @@ public HttpServletRequest wrapRequest(HttpServletRequest request) throws IOExcep
         if (content_type != null && content_type.contains("multipart/form-data")) {
             MultiPartRequest mpr = getMultiPartRequest();
             LocaleProvider provider = getContainer().getInstance(LocaleProvider.class);
-            request = new MultiPartRequestWrapper(mpr, request, getSaveDir(), provider);
+            request = new MultiPartRequestWrapper(mpr, request, getSaveDir(), provider, disableRequestAttributeValueStackLookup);
         } else {
             request = new StrutsRequestWrapper(request, disableRequestAttributeValueStackLookup);
         }

core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java

@@ -21,6 +21,7 @@
 
 package org.apache.struts2.dispatcher.multipart;
 
+import com.opensymphony.xwork2.DefaultLocaleProvider;
 import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.logging.Logger;
@@ -71,8 +72,10 @@ public class MultiPartRequestWrapper extends StrutsRequestWrapper {
      * @param saveDir Target directory for any files that we save
      * @param provider
      */
-    public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, HttpServletRequest request, String saveDir, LocaleProvider provider) {
-        super(request);
+    public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, HttpServletRequest request,
+                                   String saveDir, LocaleProvider provider,
+                                   boolean disableRequestAttributeValueStackLookup) {
+        super(request, disableRequestAttributeValueStackLookup);
         errors = new ArrayList<String>();
         multi = multiPartRequest;
         defaultLocale = provider.getLocale();
@@ -90,6 +93,10 @@ public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, HttpServletReq
         } 
     }
 
+    public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, HttpServletRequest request, String saveDir, LocaleProvider provider) {
+        this(multiPartRequest, request, saveDir, provider, false);
+    }
+
     protected void setLocale(HttpServletRequest request) {
         if (defaultLocale == null) {
             defaultLocale = request.getLocale();