From 517edba10abe039e69a0d6bf4c03042e97bde93b Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Tue, 1 Oct 2024 18:41:51 -0700 Subject: [PATCH] tiny tweaks --- .../databind/deser/std/UntypedObjectDeserializer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 533352ce39..a0ee51e8dd 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 @@ -238,7 +238,7 @@ && getClass() == UntypedObjectDeserializer.class) { if (preventMerge != _nonMerging) { deser = new UntypedObjectDeserializer(deser, preventMerge); } - // Since 2.19, 31-Aug-2024: [databind#4680] Allow custom key deserializer for Object.class deserialization + // [databind#4680] Allow custom key deserializer if (customKeyDeser != null) { deser = new UntypedObjectDeserializer(deser, customKeyDeser); } @@ -593,8 +593,8 @@ protected Object mapObject(JsonParser p, DeserializationContext ctxt) throws IOE * key is not null. Otherwise the original key. */ private String _customDeserializeKey(String key, DeserializationContext ctxt) throws IOException { - if (key != null) { - if (_customKeyDeserializer != null) { + if (_customKeyDeserializer != null) { + if (key != null) { return (String) _customKeyDeserializer.deserializeKey(key, ctxt); } }