Skip to content

Commit 11e4d93

Browse files
authored
Simplify code by using Double.isFinite() added in JDK 8 (#414)
1 parent b82ab7e commit 11e4d93

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroParserImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,10 @@ public final void skipValue() throws IOException {
161161
public final boolean isNaN() {
162162
if (_currToken == JsonToken.VALUE_NUMBER_FLOAT) {
163163
if ((_numTypesValid & NR_DOUBLE) != 0) {
164-
// 10-Mar-2017, tatu: Alas, `Double.isFinite(d)` only added in JDK 8
165-
double d = _numberDouble;
166-
return Double.isNaN(d) || Double.isInfinite(d);
164+
return !Double.isFinite(_numberDouble);
167165
}
168166
if ((_numTypesValid & NR_FLOAT) != 0) {
169-
float f = _numberFloat;
170-
return Float.isNaN(f) || Float.isInfinite(f);
167+
return !Float.isFinite(_numberFloat);
171168
}
172169
}
173170
return false;

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,13 +1868,10 @@ private final byte[] _getBinaryFromString(Base64Variant variant) throws IOExcept
18681868
public boolean isNaN() {
18691869
if (_currToken == JsonToken.VALUE_NUMBER_FLOAT) {
18701870
if ((_numTypesValid & NR_DOUBLE) != 0) {
1871-
// 10-Mar-2017, tatu: Alas, `Double.isFinite(d)` only added in JDK 8
1872-
double d = _numberDouble;
1873-
return Double.isNaN(d) || Double.isInfinite(d);
1871+
return !Double.isFinite(_numberDouble);
18741872
}
18751873
if ((_numTypesValid & NR_FLOAT) != 0) {
1876-
float f = _numberFloat;
1877-
return Float.isNaN(f) || Float.isInfinite(f);
1874+
return !Float.isFinite(_numberFloat);
18781875
}
18791876
}
18801877
return false;

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,13 +1495,10 @@ public int readBinaryValue(Base64Variant b64variant, OutputStream out) throws IO
14951495
public boolean isNaN() {
14961496
if (_currToken == JsonToken.VALUE_NUMBER_FLOAT) {
14971497
if ((_numTypesValid & NR_DOUBLE) != 0) {
1498-
// 10-Mar-2017, tatu: Alas, `Double.isFinite(d)` only added in JDK 8
1499-
double d = _numberDouble;
1500-
return Double.isNaN(d) || Double.isInfinite(d);
1498+
return !Double.isFinite(_numberDouble);
15011499
}
15021500
if ((_numTypesValid & NR_FLOAT) != 0) {
1503-
float f = _numberFloat;
1504-
return Float.isNaN(f) || Float.isInfinite(f);
1501+
return !Float.isFinite(_numberFloat);
15051502
}
15061503
}
15071504
return false;

smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBase.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,14 +428,11 @@ public final boolean isNaN() throws IOException {
428428
if (_numTypesValid == NR_UNKNOWN) {
429429
_parseNumericValue(); // will also check event type
430430
}
431-
if (_numberType == NumberType.DOUBLE) {
432-
// 10-Mar-2017, tatu: Alas, `Double.isFinite(d)` only added in JDK 8
433-
double d = _numberDouble;
434-
return Double.isNaN(d) || Double.isInfinite(d);
431+
if ((_numTypesValid & NR_DOUBLE) != 0) {
432+
return !Double.isFinite(_numberDouble);
435433
}
436-
if (_numberType == NumberType.FLOAT) {
437-
float f = _numberFloat;
438-
return Float.isNaN(f) || Float.isInfinite(f);
434+
if ((_numTypesValid & NR_FLOAT) != 0) {
435+
return !Float.isFinite(_numberFloat);
439436
}
440437
}
441438
return false;

0 commit comments

Comments
 (0)