From 92b4511aa5599baf2b9df67d643a0d3c06f67597 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 13 Oct 2024 21:37:51 +0900 Subject: [PATCH 1/2] Fixed serializer fetching for delegateValue wrt https://github.com/FasterXML/jackson-module-kotlin/issues/819 --- .../jackson/databind/ser/std/StdDelegatingSerializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java index 6f3b014d22..36b1f59869 100644 --- a/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/ser/std/StdDelegatingSerializer.java @@ -181,7 +181,7 @@ public void serializeWithType(Object value, JsonGenerator gen, SerializerProvide } JsonSerializer ser = _delegateSerializer; if (ser == null) { - ser = _findSerializer(value, provider); + ser = _findSerializer(delegateValue, provider); } ser.serializeWithType(delegateValue, gen, provider, typeSer); } From 970c3c4215fc42a879619201d26c4fe0ba37cea5 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Mon, 14 Oct 2024 09:26:48 +0900 Subject: [PATCH 2/2] Update release notes wrt #4749 --- release-notes/CREDITS-2.x | 4 ++++ release-notes/VERSION-2.x | 3 +++ 2 files changed, 7 insertions(+) diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index c5fc3bd252..016a3d7cc6 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -1840,3 +1840,7 @@ Rikkarth (rikkarth@github) Maxim Valeev (@MaximValeev) * Reported #4508: Deserialized JsonAnySetter field in Kotlin data class is null (2.18.1) + +wrongwrong (@k163377) + * Contributed #4749: Fixed problem in StdDelegatingSerializer#serializeWithType where final serializer lookup was done + on the pre-converted value when _delegateSerializer was null diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index f50090dcef..23c805744b 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -6,6 +6,9 @@ Project: jackson-databind 2.18.1 (WIP-2024) +#4749: Fixed a problem with `StdDelegatingSerializer#serializeWithType` looking up the serializer + with the wrong argument + (fix by wrongwrong) #4508: Deserialized JsonAnySetter field in Kotlin data class is null (reported by @MaximValeev) (fix by Joo-Hyuk K)