nbubna 2003/11/10 17:55:22
Modified: src/java/org/apache/velocity/tools/generic DateTool.java
Log:
the trivial change i actually meant to commit last time
Revision Changes Path
1.8 +6 -4
jakarta-velocity-tools/src/java/org/apache/velocity/tools/generic/DateTool.java
Index: DateTool.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/generic/DateTool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DateTool.java 11 Nov 2003 01:16:54 -0000 1.7
+++ DateTool.java 11 Nov 2003 01:55:21 -0000 1.8
@@ -540,9 +540,9 @@
protected DateFormat getDateFormat(int dateStyle, int timeStyle,
Locale locale, TimeZone timezone)
{
- DateFormat df = null;
try
{
+ DateFormat df;
if (dateStyle < 0 && timeStyle < 0)
{
// no style was specified, use default instance
@@ -564,10 +564,12 @@
locale);
}
df.setTimeZone(timezone);
+ return df;
}
- catch (RuntimeException suppressed)
+ catch (Exception suppressed)
{
- return df;
+ // let it go...
+ return null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
