From 983a38fb59fcc6b3bb815f053c887692d34fc089 Mon Sep 17 00:00:00 2001
From: Vladimir Tsanev <tsachev@gmail.com>
Date: Wed, 7 Aug 2019 20:51:44 +0300
Subject: [PATCH] Fix #822

---
 .../jackson/databind/deser/BuilderBasedDeserializer.java      | 2 +-
 .../jackson/databind/deser/builder/BuilderSimpleTest.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
index 25ac8ea31c..eee0077f50 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
@@ -506,7 +506,7 @@ protected final Object _deserialize(JsonParser p,
                 return _handleUnexpectedWithin(p, ctxt, builder);
             }
             p.nextToken();
-            handleUnknownVanilla(p, ctxt, handledType(), p.currentName());
+            handleUnknownVanilla(p, ctxt, builder, p.currentName());
         }
     }
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java
index aeeb651b90..6b6979d34b 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java
@@ -217,9 +217,9 @@ static class ValueBuilder822
         public int x;
         private Map<String,Object> stuff = new HashMap<String,Object>();
         
-        public ValueBuilder822 withX(int x0) {
+        @JsonCreator
+        public ValueBuilder822(@JsonProperty("x") int x0) {
             this.x = x0;
-            return this;
         }
 
         @JsonAnySetter