Skip to content

Commit 8d5bd66

Browse files
committed
backport contextualization fix wrt ReferenceTypeSerializer (for AtomicReference)
1 parent ce11473 commit 8d5bd66

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/main/java/com/fasterxml/jackson/databind/ser/std/ReferenceTypeSerializer.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,18 @@ private final JsonSerializer<Object> _findCachedSerializer(SerializerProvider pr
337337
private final JsonSerializer<Object> _findSerializer(SerializerProvider provider,
338338
Class<?> type, BeanProperty prop) throws JsonMappingException
339339
{
340-
return provider.findTypedValueSerializer(type, true, prop);
340+
// 13-Mar-2017, tatu: Used to call `findTypeValueSerializer()`, but contextualization
341+
// not working for that case for some reason
342+
// return provider.findTypedValueSerializer(type, true, prop);
343+
return provider.findValueSerializer(type, prop);
341344
}
342345

343346
private final JsonSerializer<Object> _findSerializer(SerializerProvider provider,
344347
JavaType type, BeanProperty prop) throws JsonMappingException
345348
{
346-
return provider.findTypedValueSerializer(type, true, prop);
349+
// 13-Mar-2017, tatu: Used to call `findTypeValueSerializer()`, but contextualization
350+
// not working for that case for some reason
351+
// return provider.findTypedValueSerializer(type, true, prop);
352+
return provider.findValueSerializer(type, prop);
347353
}
348-
349354
}

0 commit comments

Comments
 (0)