niallp 2004/09/03 13:11:19
Modified: src/share/org/apache/struts/validator FieldChecks.java
Log:
Fix empty Validator results map caused by Bug 26413 patch - reported by Casey Forbes
Revision Changes Path
1.20 +36 -35
jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java
Index: FieldChecks.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/FieldChecks.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FieldChecks.java 16 Apr 2004 00:08:17 -0000 1.19
+++ FieldChecks.java 3 Sep 2004 20:11:19 -0000 1.20
@@ -259,12 +259,12 @@
[EMAIL PROTECTED] request Current request object.
[EMAIL PROTECTED] true if valid, false otherwise.
*/
- public static boolean validateByte(Object bean,
+ public static Object validateByte(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Byte result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -273,7 +273,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
result = GenericTypeValidator.formatByte(value);
@@ -282,7 +282,7 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
}
@@ -298,11 +298,11 @@
* @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static boolean validateShort(Object bean,
+ public static Object validateShort(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Short result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -311,7 +311,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
result = GenericTypeValidator.formatShort(value);
@@ -320,7 +320,7 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
}
@@ -336,11 +336,11 @@
* @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static boolean validateInteger(Object bean,
+ public static Object validateInteger(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Integer result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -349,7 +349,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
result = GenericTypeValidator.formatInt(value);
@@ -358,7 +358,7 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
}
@@ -374,11 +374,11 @@
* @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static boolean validateLong(Object bean,
+ public static Object validateLong(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Long result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -387,7 +387,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
result = GenericTypeValidator.formatLong(value);
@@ -396,7 +396,7 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
}
@@ -412,11 +412,11 @@
* @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static boolean validateFloat(Object bean,
+ public static Object validateFloat(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Float result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -425,7 +425,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
result = GenericTypeValidator.formatFloat(value);
@@ -434,7 +434,7 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
}
@@ -450,11 +450,11 @@
* @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static boolean validateDouble(Object bean,
+ public static Object validateDouble(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Double result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -463,7 +463,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
result = GenericTypeValidator.formatDouble(value);
@@ -472,7 +472,7 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
}
@@ -494,12 +494,12 @@
* @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static boolean validateDate(Object bean,
+ public static Object validateDate(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Date result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -511,7 +511,7 @@
Locale locale = RequestUtils.getUserLocale(request, null);
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
try {
@@ -530,7 +530,7 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
}
/**
@@ -681,12 +681,12 @@
* @param request Current request object.
* @return true if valid, false otherwise.
*/
- public static boolean validateCreditCard(Object bean,
+ public static Object validateCreditCard(Object bean,
ValidatorAction va, Field field,
ActionMessages errors,
HttpServletRequest request) {
- Long result = null;
+ Object result = null;
String value = null;
if (isString(bean)) {
value = (String) bean;
@@ -695,7 +695,7 @@
}
if (GenericValidator.isBlankOrNull(value)) {
- return true;
+ return Boolean.TRUE;
}
result = GenericTypeValidator.formatCreditCard(value);
@@ -704,7 +704,8 @@
errors.add(field.getKey(), Resources.getActionMessage(request, va,
field));
}
- return result == null ? false : true;
+ return result == null ? Boolean.FALSE : result;
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
