You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2020/05/04 05:04:24 UTC
[struts] branch master updated: Merge pull request #411 from
JCgH4164838Gh792C124B5/WW-5072_fix
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/master by this push:
new 6afcbf2 Merge pull request #411 from JCgH4164838Gh792C124B5/WW-5072_fix
new a5f5efb Merge pull request #412 from JCgH4164838Gh792C124B5/WW-5072_CPickPR411
6afcbf2 is described below
commit 6afcbf28613e26da9fff3801b22d39da52fb764d
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun May 3 12:00:20 2020 +0200
Merge pull request #411 from JCgH4164838Gh792C124B5/WW-5072_fix
Minor change to fix WW-5072
(cherry picked from commit e46e662a7ac7fde7f96ff322e557190765a88cc9)
---
.../org/apache/struts2/showcase/fileupload/FileUploadAction.java | 8 ++++++++
.../struts2/showcase/fileupload/FileUploadAction-validation.xml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
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 class FileUploadAction extends ActionSupport {
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>