Some additions to null handling via coercion

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java

@@ -526,7 +526,12 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt) throw
         if (_valueTypeDeserializer != null) {
             return _valueDeserializer.deserializeWithType(p, ctxt, _valueTypeDeserializer);
         }
-        return _valueDeserializer.deserialize(p, ctxt);
+        // 04-May-2018, tatu: [databind#2023] Coercion from String (mostly) can give null
+        Object value =  _valueDeserializer.deserialize(p, ctxt);
+        if (value == null) {
+            value = _nullProvider.getNullValue(ctxt);
+        }
+        return value;
     }
 
     /**
@@ -551,7 +556,15 @@ public final Object deserializeWith(JsonParser p, DeserializationContext ctxt,
                             getName()));
 //            return _valueDeserializer.deserializeWithType(p, ctxt, _valueTypeDeserializer);
         }
-        return _valueDeserializer.deserialize(p, ctxt, toUpdate);
+        // 04-May-2018, tatu: [databind#2023] Coercion from String (mostly) can give null
+        Object value = _valueDeserializer.deserialize(p, ctxt, toUpdate);
+        if (value == null) {
+            if (NullsConstantProvider.isSkipper(_nullProvider)) {
+                return toUpdate;
+            }
+            value = _nullProvider.getNullValue(ctxt);
+        }
+        return value;
     }
 
     /*