Skip to content

Commit 62c17c7

Browse files
committed
Fix last 2 lgtm warnings
1 parent 89f6076 commit 62c17c7

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,8 @@ protected final NullValueProvider _findNullProvider(DeserializationContext ctxt,
18951895
{
18961896
if (nulls == Nulls.FAIL) {
18971897
if (prop == null) {
1898-
return NullsFailProvider.constructForRootValue(ctxt.constructType(valueDeser.handledType()));
1898+
Class<?> rawType = (valueDeser == null) ? Object.class : valueDeser.handledType();
1899+
return NullsFailProvider.constructForRootValue(ctxt.constructType(rawType));
18991900
}
19001901
return NullsFailProvider.constructForProperty(prop);
19011902
}
@@ -1910,9 +1911,10 @@ protected final NullValueProvider _findNullProvider(DeserializationContext ctxt,
19101911
// NOTE: although we could use `ValueInstantiator.Gettable` in general,
19111912
// let's not since that would prevent being able to use custom impls:
19121913
if (valueDeser instanceof BeanDeserializerBase) {
1913-
ValueInstantiator vi = ((BeanDeserializerBase) valueDeser).getValueInstantiator();
1914+
BeanDeserializerBase bd = (BeanDeserializerBase) valueDeser;
1915+
ValueInstantiator vi = bd.getValueInstantiator();
19141916
if (!vi.canCreateUsingDefault()) {
1915-
final JavaType type = prop.getType();
1917+
final JavaType type = (prop == null) ? bd.getValueType() : prop.getType();
19161918
return ctxt.reportBadDefinition(type,
19171919
String.format("Cannot create empty instance of %s, no default Creator", type));
19181920
}

0 commit comments

Comments
 (0)