From 28dfa96220f531419674ae3267066198a04ca395 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 27 Jan 2021 10:03:15 -0800 Subject: [PATCH] Add release notes wrt #3025 --- release-notes/CREDITS-2.x | 6 +++++- release-notes/VERSION-2.x | 3 +++ .../databind/deser/std/UntypedObjectDeserializer.java | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x index 23c3f621e2..e5c02316bf 100644 --- a/release-notes/CREDITS-2.x +++ b/release-notes/CREDITS-2.x @@ -1294,7 +1294,11 @@ Faron Dutton (fdutton@github) (2.12.1) SunYiJun (xiaosunzhu@github) - * Reported, suggested fix for #2979: Conflicting in POJOPropertiesCollector when having namingStrategy (2.12.1) + +Miguel G (Migwel@github) + * Reported, contributed fix for #3025: UntypedObjectDeserializer` mixes multiple unwrapped + collections (related to #2733) + (2.12.2) diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x index 377e642355..11e0005df4 100644 --- a/release-notes/VERSION-2.x +++ b/release-notes/VERSION-2.x @@ -9,6 +9,9 @@ Project: jackson-databind #3022: Property ignorals cause `BeanDeserializer `to forget how to read from arrays (not copying `_arrayDelegateDeserializer`) (reported by Gian M) +#3025: UntypedObjectDeserializer` mixes multiple unwrapped + collections (related to #2733) + (fix contributed by Migwel@github) 2.12.1 (08-Jan-2021) diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java index e7331018d1..63f5c60703 100644 --- a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java +++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java @@ -971,13 +971,13 @@ protected Object mapObject(JsonParser p, DeserializationContext ctxt) throws IOE // NOTE: copied from above (alas, no easy way to share/reuse) // @since 2.12 (wrt [databind#2733] protected Object _mapObjectWithDups(JsonParser p, DeserializationContext ctxt, - final Map result, String key, + final Map result, String initialKey, Object oldValue, Object newValue, String nextKey) throws IOException { final boolean squashDups = ctxt.isEnabled(StreamReadCapability.DUPLICATE_PROPERTIES); if (squashDups) { - _squashDups(result, key, oldValue, newValue); + _squashDups(result, initialKey, oldValue, newValue); } while (nextKey != null) { @@ -1008,6 +1008,5 @@ private void _squashDups(final Map result, String key, result.put(key, l); } } - } }