Skip to content

Reuse Calendar instance during parsing by StdDateFormat #1759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2017
Merged

Reuse Calendar instance during parsing by StdDateFormat #1759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/main/java/com/fasterxml/jackson/databind/util/StdDateFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,14 +432,7 @@ public StringBuffer format(Date date, StringBuffer toAppendTo,
protected void _format(TimeZone tz, Locale loc, Date date,
StringBuffer buffer)
{
Calendar cal = _calendar;
if (cal == null ) {
_calendar = cal = (Calendar)CALENDAR.clone();
}
if (!cal.getTimeZone().equals(tz) ) {
cal.setTimeZone(tz);
}
// Note: Calendar locale not updated since we don't need it here...
Calendar cal = _getCalendar(tz);
cal.setTime(date);

pad4(buffer, cal.get(Calendar.YEAR));
Expand Down Expand Up @@ -605,10 +598,7 @@ protected Date _parseAsISO8601(String dateStr, ParsePosition bogus)
if ((_timezone != null) && ('Z' != dateStr.charAt(totalLen-1))) {
tz = _timezone;
}
Calendar cal = new GregorianCalendar(tz, _locale);
if (_lenient != null) {
cal.setLenient(_lenient.booleanValue());
}
Calendar cal = _getCalendar(tz);
String formatStr;
if (totalLen <= 10) {
Matcher m = PATTERN_PLAIN.matcher(dateStr);
Expand Down Expand Up @@ -757,6 +747,20 @@ protected void _clearFormats() {
_formatRFC1123 = null;
}

protected Calendar _getCalendar(TimeZone tz) {
Calendar cal = _calendar;
if (cal == null ) {
_calendar = cal = (Calendar)CALENDAR.clone();
}
if (!cal.getTimeZone().equals(tz) ) {
cal.setTimeZone(tz);
}
cal.setLenient(isLenient());
cal.clear();

return cal;
}

protected static <T> boolean _equals(T value1, T value2) {
if (value1 == value2) {
return true;
Expand Down