commit | a5f5efb4a82b91b38edfaa5ec64a47526288de11 | [log] [tgz] |
---|---|---|
author | Lukasz Lenart <lukaszlenart@apache.org> | Mon May 04 07:04:12 2020 +0200 |
committer | GitHub <noreply@github.com> | Mon May 04 07:04:12 2020 +0200 |
tree | f46ef60c3dd7f0445bb2e6f6b3acda165b5f67e1 | |
parent | 0a5399957674b19d589cd5b1069cfc5491bbdd67 [diff] | |
parent | 6afcbf28613e26da9fff3801b22d39da52fb764d [diff] |
Merge pull request #412 from JCgH4164838Gh792C124B5/WW-5072_CPickPR411 Cherry-Pick PR#411 into master
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java index 6005306..ed8a11b 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
@@ -84,4 +84,12 @@ public void setCaption(String caption) { this.caption = caption; } + + public long getUploadSize() { + if (upload != null) { + return upload.length(); + } else { + return 0; + } + } }
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml index df2dd55..cfd4178 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
@@ -26,7 +26,7 @@ <validators> <field name="upload"> <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[upload.length() > 0]]></param> + <param name="expression"><![CDATA[getUploadSize() > 0]]></param> <message>File cannot be empty</message> </field-validator> </field>