Skip to content

Commit 96dd040

Browse files
committed
Merge branch 'master' of github.com:FasterXML/jackson-databind
2 parents 1b63bab + 614a72e commit 96dd040

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public abstract class DeserializationProblemHandler
3131
* Content (supposedly) matching the property are accessible via
3232
* parser that can be obtained from passed deserialization context.
3333
* Handler can also choose to skip the content; if so, it MUST return
34-
* true to indicate it did handle property succesfully.
34+
* true to indicate it did handle property successfully.
3535
* Skipping is usually done like so:
3636
*<pre>
37-
* ctxt.getParser().skipChildren();
37+
* jp.skipChildren();
3838
*</pre>
3939
*<p>
4040
* Note: version 1.2 added new deserialization feature

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

+3
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ public SettableBeanProperty[] getPropertiesInInsertionOrder()
213213

214214
public SettableBeanProperty find(String key)
215215
{
216+
if (key == null) {
217+
throw new IllegalArgumentException("Can not pass null property name");
218+
}
216219
int index = key.hashCode() & _hashMask;
217220
Bucket bucket = _buckets[index];
218221
// Let's unroll first lookup since that is null or match in 90+% cases

0 commit comments

Comments
 (0)