Updated Branches: refs/heads/master 926e80474 -> ce74f05b0
WICKET-4839 Date converters should use a new instance of DateFormat to be thread safe Revert the change that introduced the cloning of the DataFormats Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ce74f05b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ce74f05b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ce74f05b Branch: refs/heads/master Commit: ce74f05b05ceb83c6c6f5a9fe160fac8d3130c9b Parents: 926e804 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Nov 15 10:50:09 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Nov 15 10:50:09 2012 +0200 ---------------------------------------------------------------------- .../util/convert/converter/DateConverter.java | 2 +- .../util/convert/converter/SqlDateConverter.java | 2 +- .../util/convert/converter/SqlTimeConverter.java | 4 ++-- .../convert/converter/SqlTimestampConverter.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ce74f05b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java index cfa173a..c2f16a1 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/DateConverter.java @@ -73,7 +73,7 @@ public class DateConverter extends AbstractConverter<Date> locale = Locale.getDefault(); } - return (DateFormat) DateFormat.getDateInstance(DateFormat.SHORT, locale).clone(); + return DateFormat.getDateInstance(DateFormat.SHORT, locale); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/ce74f05b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java index 54f02c7..c86c508 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java @@ -75,7 +75,7 @@ public class SqlDateConverter extends AbstractConverter<Date> locale = Locale.getDefault(); } - return (DateFormat) DateFormat.getDateInstance(DateFormat.SHORT, locale).clone(); + return DateFormat.getDateInstance(DateFormat.SHORT, locale); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/ce74f05b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java index 340e73c..43433f3 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java @@ -44,7 +44,7 @@ public class SqlTimeConverter extends AbstractConverter<Time> { locale = Locale.getDefault(); } - DateFormat format = (DateFormat) DateFormat.getTimeInstance(DateFormat.SHORT, locale).clone(); + DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT, locale); try { Date date = format.parse(value); @@ -71,7 +71,7 @@ public class SqlTimeConverter extends AbstractConverter<Time> { locale = Locale.getDefault(); } - DateFormat format = (DateFormat) DateFormat.getTimeInstance(DateFormat.SHORT, locale).clone(); + DateFormat format = DateFormat.getTimeInstance(DateFormat.SHORT, locale); return format.format(time); } http://git-wip-us.apache.org/repos/asf/wicket/blob/ce74f05b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java index 83b682f..432c1ac 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java @@ -88,7 +88,7 @@ public class SqlTimestampConverter extends AbstractConverter<Timestamp> locale = Locale.getDefault(); } - DateFormat format = (DateFormat) DateFormat.getDateTimeInstance(dateFormat, timeFormat, locale).clone(); + DateFormat format = DateFormat.getDateTimeInstance(dateFormat, timeFormat, locale); try { Date date = format.parse(value); @@ -119,7 +119,7 @@ public class SqlTimestampConverter extends AbstractConverter<Timestamp> locale = Locale.getDefault(); } - DateFormat format = (DateFormat) DateFormat.getDateTimeInstance(dateFormat, timeFormat, locale).clone(); + DateFormat format = DateFormat.getDateTimeInstance(dateFormat, timeFormat, locale); return format.format(timestamp); }
