Skip to content

Commit aa4dbab

Browse files
committed
Reduce the number of times value == null is determined
wrt #5140 (comment)
1 parent 71080d5 commit aa4dbab

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -360,13 +360,14 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
360360

361361
if (value == null) {
362362
value = _nullProvider.getNullValue(ctxt);
363-
}
364363

365-
// _skipNullValues is checked by _tryToAddNull.
366-
if (value == null) {
367-
_tryToAddNull(p, ctxt, result);
368-
continue;
364+
// _skipNullValues is checked by _tryToAddNull.
365+
if (value == null) {
366+
_tryToAddNull(p, ctxt, result);
367+
continue;
368+
}
369369
}
370+
370371
result.add(value);
371372

372373
/* 17-Dec-2017, tatu: should not occur at this level...
@@ -418,12 +419,12 @@ protected final Collection<Object> handleNonArray(JsonParser p, DeserializationC
418419

419420
if (value == null) {
420421
value = _nullProvider.getNullValue(ctxt);
421-
}
422422

423-
// _skipNullValues is checked by _tryToAddNull.
424-
if (value == null) {
425-
_tryToAddNull(p, ctxt, result);
426-
return result;
423+
// _skipNullValues is checked by _tryToAddNull.
424+
if (value == null) {
425+
_tryToAddNull(p, ctxt, result);
426+
return result;
427+
}
427428
}
428429
} catch (Exception e) {
429430
boolean wrap = ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
@@ -467,10 +468,10 @@ protected Collection<Object> _deserializeWithObjectId(JsonParser p, Deserializat
467468

468469
if (value == null) {
469470
value = _nullProvider.getNullValue(ctxt);
470-
}
471471

472-
if (value == null && _skipNullValues) {
473-
continue;
472+
if (value == null && _skipNullValues) {
473+
continue;
474+
}
474475
}
475476
referringAccumulator.add(value);
476477
} catch (UnresolvedForwardReference reference) {

0 commit comments

Comments
 (0)