diff options
| author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-02 15:06:04 -0700 |
|---|---|---|
| committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-07-02 15:06:04 -0700 |
| commit | 2fd9e09ec97cd890ec5cfccb1c0ed2abe873e7ee (patch) | |
| tree | 5e003b07ea5060b5ad950bb60c0808c9459f160d /src/main/java/com/fasterxml | |
| parent | 58c9211bcc04d3bd4e6e726f10997fc7e6538e25 (diff) | |
| parent | d16b8b1e0c70707ec294e4b0515ac316491ac24e (diff) | |
| download | jackson-databind-2fd9e09ec97cd890ec5cfccb1c0ed2abe873e7ee.tar.gz | |
Merge branch '2.11' into 2.12
Diffstat (limited to 'src/main/java/com/fasterxml')
| -rw-r--r-- | src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java index 29c93fdbb..438886fdd 100644 --- a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java +++ b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java @@ -1332,7 +1332,7 @@ ClassUtil.getClassDescription(scalarType), _shapeForToken(JsonToken.START_OBJECT * {@link JsonToken#VALUE_NUMBER_INT} or {@link JsonToken#VALUE_NUMBER_FLOAT}. * * @param targetType Type that was to be instantiated - * @param t Token encountered that does match expected + * @param t Token encountered that does not match expected * @param p Parser that points to the JSON value to decode * * @return Object that should be constructed, if any; has to be of type <code>instClass</code> |