Skip to content

Commit 98fc3d0

Browse files
committed
Prep work for #355
1 parent af80336 commit 98fc3d0

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/JSR310FormattedSerializerBase.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ protected SerializationFeature getTimestampsFeature() {
219219
return SerializationFeature.WRITE_DATES_AS_TIMESTAMPS;
220220
}
221221

222-
protected boolean useTimestamp(SerializerProvider provider) {
222+
protected boolean useTimestamp(SerializerProvider ctxt) {
223223
if (_useTimestamp != null) {
224224
return _useTimestamp.booleanValue();
225225
}
@@ -232,8 +232,13 @@ protected boolean useTimestamp(SerializerProvider provider) {
232232
}
233233
}
234234
// assume that explicit formatter definition implies use of textual format
235-
return (_formatter == null) && (provider != null)
236-
&& provider.isEnabled(getTimestampsFeature());
235+
return (_formatter == null) && useTimestampFromGlobalDefaults(ctxt);
236+
}
237+
238+
// @since 2.19
239+
protected boolean useTimestampFromGlobalDefaults(SerializerProvider ctxt) {
240+
return (ctxt != null)
241+
&& ctxt.isEnabled(getTimestampsFeature());
237242
}
238243

239244
protected boolean _useTimestampExplicitOnly(SerializerProvider provider) {

0 commit comments

Comments
 (0)