Skip to content

Commit 5fda55f

Browse files
committed
Merge pull request #63 from ZioberMichal/master
Fixed issue 49
2 parents a0eea1b + c92b586 commit 5fda55f

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

src/main/java/com/fasterxml/jackson/datatype/joda/cfg/JacksonJodaDateFormat.java

+16-8
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,8 @@ public JacksonJodaDateFormat withLocale(Locale locale) {
116116

117117
public DateTimeFormatter createFormatter(SerializerProvider provider)
118118
{
119-
DateTimeFormatter formatter = _formatter;
120-
121-
if (!_explicitLocale) {
122-
Locale loc = provider.getLocale();
123-
if (loc != null && !loc.equals(_locale)) {
124-
formatter = formatter.withLocale(loc);
125-
}
126-
}
119+
DateTimeFormatter formatter = createFormatterWithLocale(provider);
120+
127121
if (!_explicitTimezone) {
128122
TimeZone tz = provider.getTimeZone();
129123
if (tz != null && !tz.equals(_jdkTimezone)) {
@@ -133,6 +127,20 @@ public DateTimeFormatter createFormatter(SerializerProvider provider)
133127

134128
return formatter;
135129
}
130+
131+
public DateTimeFormatter createFormatterWithLocale(SerializerProvider provider)
132+
{
133+
DateTimeFormatter formatter = _formatter;
134+
135+
if (!_explicitLocale) {
136+
Locale loc = provider.getLocale();
137+
if (loc != null && !loc.equals(_locale)) {
138+
formatter = formatter.withLocale(loc);
139+
}
140+
}
141+
142+
return formatter;
143+
}
136144

137145
/*
138146
/**********************************************************

src/main/java/com/fasterxml/jackson/datatype/joda/ser/DateMidnightSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public final class DateMidnightSerializer
1515
{
1616
private static final long serialVersionUID = 1L;
1717

18-
public DateMidnightSerializer() { this(FormatConfig.DEFAULT_DATEONLY_FORMAT); }
18+
public DateMidnightSerializer() { this(FormatConfig.DEFAULT_LOCAL_DATEONLY_FORMAT); }
1919
public DateMidnightSerializer(JacksonJodaDateFormat format) {
2020
// true -> use arrays
2121
super(DateMidnight.class, format, true,
@@ -44,7 +44,7 @@ public void serialize(DateMidnight value, JsonGenerator jgen, SerializerProvider
4444
jgen.writeNumber(value.dayOfMonth().get());
4545
jgen.writeEndArray();
4646
} else {
47-
jgen.writeString(_format.createFormatter(provider).print(value));
47+
jgen.writeString(_format.createFormatterWithLocale(provider).print(value));
4848
}
4949
}
5050
}

0 commit comments

Comments
 (0)