Add release notes wrt #3025

FasterXML · Jan 27, 2021 · 28dfa96 · 28dfa96
1 parent fca1e7d
commit 28dfa96
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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<String, Object> result, String key,
+                final Map<String, Object> 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<String, Object> result, String key,
                 result.put(key, l);
             }
         }
-
     }
 }