svn commit: r415047 - in /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher: DispatcherUtils.java multipart/JakartaMultiPartRequest.java

[mrdon]

Author: mrdon
Date: Sat Jun 17 12:20:52 2006
New Revision: 415047

URL: http://svn.apache.org/viewvc?rev=415047&view=rev
Log:
Changing request encoding to apply to file uploads, allowing zero-sized
file uploads

WW-1324

Modified:
    
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
    
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java?rev=415047&r1=415046&r2=415047&view=diff
==============================================================================
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
 Sat Jun 17 12:20:52 2006
@@ -411,7 +411,7 @@
             locale = 
LocalizedTextUtil.localeFromString(Configuration.getString(StrutsConstants.STRUTS_LOCALE),
 request.getLocale());
         }
 
-        if (encoding != null && !MultiPartRequest.isMultiPart(request)) {
+        if (encoding != null) {
             try {
                 request.setCharacterEncoding(encoding);
             } catch (Exception e) {

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java?rev=415047&r1=415046&r2=415047&view=diff
==============================================================================
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
 Sat Jun 17 12:20:52 2006
@@ -85,8 +85,6 @@
                         values.add(item.getString());
                     }
                     params.put(item.getFieldName(), values);
-                } else if (item.getSize() == 0) {
-                    log.warn("Item is a file upload of 0 size, ignoring");
                 } else {
                     log.debug("Item is a file upload");