jmcnally 02/04/10 18:08:57
Modified: src/services/org/apache/fulcrum/intake/model
DateStringField.java
src/services/org/apache/fulcrum/intake/validator
DateStringValidator.java
Log:
handle null
Revision Changes Path
1.4 +5 -1
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/model/DateStringField.java
Index: DateStringField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/model/DateStringField.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DateStringField.java 9 Apr 2002 01:08:13 -0000 1.3
+++ DateStringField.java 11 Apr 2002 01:08:57 -0000 1.4
@@ -142,7 +142,11 @@
{
String s = null;
Object value = getValue();
- if (value instanceof String)
+ if (value == null)
+ {
+ s = "";
+ }
+ else if (value instanceof String)
{
s = (String)value;
}
1.4 +8 -3
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/validator/DateStringValidator.java
Index: DateStringValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/intake/validator/DateStringValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DateStringValidator.java 9 Apr 2002 01:08:14 -0000 1.3
+++ DateStringValidator.java 11 Apr 2002 01:08:57 -0000 1.4
@@ -81,7 +81,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: DateStringValidator.java,v 1.3 2002/04/09 01:08:14 jmcnally Exp $
+ * @version $Id: DateStringValidator.java,v 1.4 2002/04/11 01:08:57 jmcnally Exp $
*/
public class DateStringValidator
extends DefaultValidator
@@ -217,8 +217,13 @@
public String format(Date date)
{
- sdf.applyPattern((String)dateFormats.get(0));
- return sdf.format(date);
+ String s = null;
+ if (date != null)
+ {
+ sdf.applyPattern((String)dateFormats.get(0));
+ s= sdf.format(date);
+ }
+ return s;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
