You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by jh...@apache.org on 2007/07/25 05:39:13 UTC
svn commit: r559304 -
/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Author: jholmes
Date: Tue Jul 24 20:39:12 2007
New Revision: 559304
URL: http://svn.apache.org/viewvc?view=rev&rev=559304
Log:
WW-1911 File Upload: content-type validation fails when no file is uploaded
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?view=diff&rev=559304&r1=559303&r2=559304
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java Tue Jul 24 20:39:12 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());