Skip to content

Commit 1eb2c07

Browse files
committed
Manually merge #3038 (contributed by @jellevoost)
1 parent 486ef36 commit 1eb2c07

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

release-notes/CREDITS-2.x

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,3 +1302,7 @@ Miguel G (Migwel@github)
13021302
* Reported, contributed fix for #3025: UntypedObjectDeserializer` mixes multiple unwrapped
13031303
collections (related to #2733)
13041304
(2.12.2)
1305+
1306+
Jelle Voost (jellevoost@github)
1307+
* Reported #3038: Two cases of incorrect error reporting about DeserializationFeature
1308+
(2.12.2)

release-notes/VERSION-2.x

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Project: jackson-databind
1212
#3025: UntypedObjectDeserializer` mixes multiple unwrapped
1313
collections (related to #2733)
1414
(fix contributed by Migwel@github)
15+
#3038: Two cases of incorrect error reporting about DeserializationFeature
16+
(reported by Jelle V)
1517

1618
2.12.1 (08-Jan-2021)
1719

src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public Object getParameter(SettableBeanProperty prop)
133133
}
134134
if (value == null && _context.isEnabled(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES)) {
135135
return _context.reportInputMismatch(prop,
136-
"Null value for creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_NULL_FOR_CREATOR_PARAMETERS` enabled",
136+
"Null value for creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES` enabled",
137137
prop.getName(), prop.getCreatorIndex());
138138
}
139139
return value;
@@ -173,7 +173,7 @@ public Object[] getParameters(SettableBeanProperty[] props)
173173
if (_creatorParameters[ix] == null) {
174174
SettableBeanProperty prop = props[ix];
175175
_context.reportInputMismatch(prop,
176-
"Null value for creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_NULL_FOR_CREATOR_PARAMETERS` enabled",
176+
"Null value for creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES` enabled",
177177
prop.getName(), props[ix].getCreatorIndex());
178178
}
179179
}

0 commit comments

Comments
 (0)