Merge branch '2.12'

sp4ce · Jun 13, 2020 · 4bbd207 · 4bbd207
2 parents 3b88838 + 96d9903
commit 4bbd207
Show file tree

Hide file tree

Showing 3 changed files with 259 additions and 272 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicBooleanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/AtomicBooleanDeserializer.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.type.LogicalType;
 
 public class AtomicBooleanDeserializer extends StdScalarDeserializer<AtomicBoolean>
@@ -29,4 +30,9 @@ public AtomicBoolean deserialize(JsonParser p, DeserializationContext ctxt) thro
 
     @Override
     public LogicalType logicalType() { return LogicalType.Boolean; }
-}
+
+    @Override // @since 2.12
+    public Object getEmptyValue(DeserializationContext ctxt) throws JsonMappingException {
+        return new AtomicBoolean(false);
+    }
+}