svn commit: r559307 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java

[jholmes]

Author: jholmes
Date: Tue Jul 24 20:45:17 2007
New Revision: 559307

URL: http://svn.apache.org/viewvc?view=rev&rev=559307
Log:
WW-1911 File Upload: content-type validation fails when no file is uploaded

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

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?view=diff&rev=559307&r1=559306&r2=559307
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
 Tue Jul 24 20:45:17 2007
@@ -115,6 +115,12 @@
                 } else {
                     log.debug("Item is a file upload");
 
+                    // Skip file uploads that don't have a file name - meaning 
that no file was selected.
+                    if (item.getName() == null || 
item.getName().trim().length() < 1) {
+                        log.debug("No file has been uploaded for the field: " 
+ item.getFieldName());
+                        continue;
+                    }
+
                     List<FileItem> values;
                     if (files.get(item.getFieldName()) != null) {
                         values = files.get(item.getFieldName());