Merge pull request #435 from gregh3269/master
[WW-5088] Empty file upload, storeLocation null gives wrong error message.
diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index 3105b7d..bb77ea0 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -345,6 +345,14 @@
if (LOG.isWarnEnabled()) {
LOG.warn(errMsg);
}
+ } else if (file.getContent() == null) {
+ String errMsg = getTextMessage(action, "struts.messages.error.uploading", new String[]{filename});
+ if (validation != null) {
+ validation.addFieldError(inputName, errMsg);
+ }
+ if (LOG.isWarnEnabled()) {
+ LOG.warn(errMsg);
+ }
} else if (maximumSize != null && maximumSize < file.length()) {
String errMsg = getTextMessage(action, "struts.messages.error.file.too.large", new String[]{inputName, filename, file.getName(), "" + file.length(), getMaximumSizeStr(action)});
if (validation != null) {
