From 23ddc8f02970d0bf6a3c6673728e3970eab4edc2 Mon Sep 17 00:00:00 2001
From: Greg Huber <ghuber@guestales.co.uk>
Date: Fri, 4 Sep 2020 13:23:15 +0100
Subject: [PATCH] Empty file upload, storeLocation null gives wrong error
 message.

---
 .../apache/struts2/interceptor/FileUploadInterceptor.java | 8 ++++++++
 1 file changed, 8 insertions(+)

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 3105b7d8d..bb77ea093 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -342,6 +342,14 @@ public class FileUploadInterceptor extends AbstractInterceptor {
                 validation.addFieldError(inputName, errMsg);
             }
 
+            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);
             }