Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv14588
Modified Files:
AbstractUploadAction.java
Log Message:
CMSC-681 Asset Maintenance upload maxsize file
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: AbstractUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AbstractUploadAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractUploadAction.java 6 Jan 2009 07:59:41 -0000 1.1
+++ AbstractUploadAction.java 13 Jan 2009 06:06:42 -0000 1.2
@@ -116,12 +116,17 @@
}
public boolean maxFileSizeBiggerThan(int fileSize) {
- int maxFileSize = 16 * 1024 * 1024; // Default value of 16MB
+ int maxFileSize = 8 * 1024 * 1024; // Default value of 16MB
try {
maxFileSize =
Integer.parseInt(PropertiesUtil.getProperty(UPLOADED_FILE_MAX_SIZE)) * 1024 *
1024;
+ // check invalid value of UPLOADED_FILE_MAX_SIZE
+ if (maxFileSize <= 0) {
+ // PropertiesUtil.setProperty(UPLOADED_FILE_MAX_SIZE, "8");
+ maxFileSize = 8 * 1024 * 1024; // set default value of 16MB
+ }
} catch (NumberFormatException e) {
log.warn("System property '" + UPLOADED_FILE_MAX_SIZE + "' is not
set. Please add it (units = MB).");
}
- return (fileSize < maxFileSize);
+ return (fileSize <= maxFileSize);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
