Merge branch '2.19'

FasterXML · Nov 12, 2024 · 181ddd2 · 181ddd2
2 parents c6d9d7e + a777bf3
commit 181ddd2
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/java/tools/jackson/databind/deser/BasicDeserializerFactory.java b/src/main/java/tools/jackson/databind/deser/BasicDeserializerFactory.java
@@ -965,13 +965,9 @@ public ValueDeserializer<?> createMapDeserializer(DeserializationContext ctxt,
                         mapClass = type.getRawClass();
                         // But if so, also need to re-check creators...
                         beanDesc = ctxt.introspectBeanDescriptionForCreation(type);
-                    } else {
-                        // [databind#292]: Actually, may be fine, but only if polymorphic deser enabled
-                        if (type.getTypeHandler() == null) {
-                            throw new IllegalArgumentException("Cannot find a deserializer for non-concrete Map type "+type);
-                        }
-                        deser = AbstractDeserializer.constructForNonPOJO(beanDesc);
                     }
+                    // 11-Nov-2024, tatu: Related to [databind#4783] let's not fail on
+                    //    abstract Maps so they can work with merge (or factory methods)
                 } else {
                     // 10-Jan-2017, tatu: `java.util.Collections` types need help:
                     deser = JavaUtilCollectionsDeserializers.findForMap(ctxt, type);