tiny tweaks

FasterXML · Oct 2, 2024 · 517edba · 517edba
1 parent c09b191
commit 517edba
Showing 1 changed file with 3 additions and 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
@@ -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);
             }
         }