| commit | f4ab5bf05c32595891520818c6cb479ef711738d | [log] [tgz] |
|---|---|---|
| author | Lukasz Lenart <lukaszlenart@apache.org> | Mon May 04 07:05:55 2020 +0200 |
| committer | GitHub <noreply@github.com> | Mon May 04 07:05:55 2020 +0200 |
| tree | d1d432887d6ec9a6b8fd6e5e2163436872f26b38 | |
| parent | a5f5efb4a82b91b38edfaa5ec64a47526288de11 [diff] | |
| parent | a6711251a68dea3f3ac89524fc65f59c7700cb15 [diff] |
Merge pull request #413 from JCgH4164838Gh792C124B5/WW-5074_CfgFix Proposed WW-5074 Fix
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>