[WW-5088] Empty file upload gives wrong error message

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 2.5.22
• Fix Version/s: 6.0.0
• Component/s: Core Interceptors
• Assignee: Unassigned
• Reporter: Greg Huber
• Created: 04/Sep/20 12:45
• Updated: 14/Jun/22 09:47
• Resolved: 07/Sep/20 07:24

Description

On an empty file upload the storeLocation is null, so adds a file new StrutsUploadedFile(null)

JakartaMultiPartRequest

List fileList = new ArrayList<>(items.size());
for (FileItem fileItem : items) {
File storeLocation = ((DiskFileItem) fileItem).getStoreLocation();
if (fileItem.isInMemory() && storeLocation != null && !storeLocation.exists()) {
try {
storeLocation.createNewFile();
} catch (IOException e) {
LOG.error("Cannot write uploaded empty file to disk: {}", storeLocation.getAbsolutePath(), e);
}
}
fileList.add(new StrutsUploadedFile(storeLocation));
}

The FileUploadInterceptor checks for a null file but not null content from the new StrutsUploadedFile(null).

eg for an empty file main.js

Error message should be:
Error uploading: main.js
but gives:
Error setting expression 'uploadedFiles' with value ['org.apache.struts2.dispatcher.multipart.StrutsUploadedFile@202585bc', ]
Error setting expression 'uploadedFiles' with value ['org.apache.struts2.dispatcher.multipart.StrutsUploadedFile@49553150', ]

Issue Links

• is duplicated by: WW-5146 Empty file upload ends in error
• links to: GitHub Pull Request #435
• links to: GitHub Pull Request #440
• links to: GitHub Pull Request #441