Skip to content

Commit 6073e32

Browse files
committed
minor cleanup for FasterXML#38, add release notes
1 parent ba7417d commit 6073e32

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Diff for: afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/OptimizedSettableBeanProperty.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,14 @@ protected void _reportProblem(Object bean, Object value, Throwable e)
175175

176176
protected final boolean _deserializeBoolean(JsonParser p, DeserializationContext ctxt) throws IOException
177177
{
178-
JsonToken t = p.getCurrentToken();
178+
JsonToken t = p.currentToken();
179179
if (t == JsonToken.VALUE_TRUE) return true;
180180
if (t == JsonToken.VALUE_FALSE) return false;
181181
if (t == JsonToken.VALUE_NULL) {
182182
if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)) {
183183
_failNullToPrimitiveCoercion(ctxt, "boolean");
184-
} else {
185-
return false;
186184
}
185+
return false;
187186
}
188187

189188
if (t == JsonToken.VALUE_NUMBER_INT) {
@@ -272,9 +271,8 @@ protected final int _deserializeInt(JsonParser p, DeserializationContext ctxt)
272271
if (t == JsonToken.VALUE_NULL) {
273272
if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)) {
274273
_failNullToPrimitiveCoercion(ctxt, "int");
275-
} else {
276-
return 0;
277274
}
275+
return 0;
278276
}
279277
if (t == JsonToken.START_ARRAY && ctxt.isEnabled(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)) {
280278
p.nextToken();
@@ -312,9 +310,8 @@ protected final long _deserializeLong(JsonParser p, DeserializationContext ctxt)
312310
case JsonTokenId.ID_NULL:
313311
if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)) {
314312
_failNullToPrimitiveCoercion(ctxt, "long");
315-
} else {
316-
return 0L;
317313
}
314+
return 0L;
318315
case JsonTokenId.ID_START_ARRAY:
319316
if (ctxt.isEnabled(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)) {
320317
p.nextToken();

Diff for: release-notes/VERSION

+7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
Project: jackson-modules-base
22
Modules:
33
jackson-module-guice
4+
jackson-module-jaxb
45
jackson-module-mrbean
56
jackson-module-osgi
7+
jackson-module-paranamer
68

79
------------------------------------------------------------------------
810
=== Releases ===
911
------------------------------------------------------------------------
1012

13+
2.9.4 (not yet released)
14+
15+
#38: (afterburner) Handle DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES correctly
16+
(reported by Qnzvna@github)
17+
1118
2.9.3 (09-Dec-2017)
1219

1320
#31: (jaxb) `@JsonAppend` causes 'IllegalStateException` `Unsupported annotated member'

0 commit comments

Comments
 (0)