Merge pull request apache#412 from JCgH4164838Gh792C124B5/WW-5072_CPickPR411

lukaszlenart · web-flow · commit a5f5efb4a82b · 2020-05-04T07:04:12.000+02:00
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
@@ -84,4 +84,12 @@ public String getCaption() {
 	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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,12 @@ public String getCaption() {`
`84`	`84`	`public void setCaption(String caption) {`
`85`	`85`	`this.caption = caption;`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ public long getUploadSize() {`
	`89`	`+ if (upload != null) {`
	`90`	`+ return upload.length();`
	`91`	`+ } else {`
	`92`	`+ return 0;`
	`93`	`+ }`
	`94`	`+ }`
`87`	`95`	`}`