...

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java

@@ -596,11 +596,11 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                     p.skipChildren();
                     continue;
                 }
-                Object value = _deserializeWithErrorWrapping(p, ctxt, creatorProp);
                 // Last creator property to set?
                 // [databind#4690] cannot quit early as optimization any more
                 // if (buffer.assignParameter(creatorProp, value)) { ... build ... }
-                buffer.assignParameter(creatorProp, value);
+                buffer.assignParameter(creatorProp,
+                        _deserializeWithErrorWrapping(p, ctxt, creatorProp));
                 continue;
             }
             // regular property? needs buffering

src/test/java/tools/jackson/databind/records/tofix/JsonIncludeNonDefaultOnRecord5312Test.java

@@ -7,14 +7,11 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonValue;
 import tools.jackson.databind.ObjectMapper;
-import tools.jackson.databind.cfg.MutableConfigOverride;
 import tools.jackson.databind.json.JsonMapper;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_DEFAULT;
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 
-import java.util.Map;
-
 // [databind#5312] Include.NON_DEFAULT regression for objects with @JsonValue
 public class JsonIncludeNonDefaultOnRecord5312Test
 {