Skip to content

Commit

Permalink
Fix #411 for master
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder committed Feb 26, 2014
1 parent 3ca881e commit 06a6ebf
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 21 deletions.
18 changes: 15 additions & 3 deletions src/main/java/com/fasterxml/jackson/databind/deser/std/NumberDeserializers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;

import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer;
Expand Down Expand Up @@ -424,15 +423,28 @@ public Number deserialize(JsonParser jp, DeserializationContext ctxt)
*/
if (t == JsonToken.VALUE_STRING) { // let's do implicit re-parse
String text = jp.getText().trim();
if (text.length() == 0) {
return getEmptyValue();
}
if (_hasTextualNull(text)) {
return getNullValue();
}
if (_isPosInf(text)) {
return Double.POSITIVE_INFINITY;
}
if (_isNegInf(text)) {
return Double.NEGATIVE_INFINITY;
}
if (_isNaN(text)) {
return Double.NaN;
}
try {
if (text.indexOf('.') >= 0) { // floating point
// as per [JACKSON-72]:
if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
return new BigDecimal(text);
}
return new Double(text);
}
// as per [JACKSON-100]:
if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
return new BigInteger(text);
}
Expand Down
41 changes: 24 additions & 17 deletions src/main/java/com/fasterxml/jackson/databind/deser/std/StdDeserializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,17 +512,17 @@ protected final Float _parseFloat(JsonParser jp, DeserializationContext ctxt)
}
switch (text.charAt(0)) {
case 'I':
if ("Infinity".equals(text) || "INF".equals(text)) {
if (_isPosInf(text)) {
return Float.POSITIVE_INFINITY;
}
break;
case 'N':
if ("NaN".equals(text)) {
if (_isNaN(text)) {
return Float.NaN;
}
break;
case '-':
if ("-Infinity".equals(text) || "-INF".equals(text)) {
if (_isNegInf(text)) {
return Float.NEGATIVE_INFINITY;
}
break;
Expand All @@ -549,7 +549,7 @@ protected final Float _parseFloat(JsonParser jp, DeserializationContext ctxt)
// Otherwise, no can do:
throw ctxt.mappingException(_valueClass, t);
}

protected final float _parseFloatPrimitive(JsonParser jp, DeserializationContext ctxt)
throws IOException
{
Expand All @@ -565,17 +565,15 @@ protected final float _parseFloatPrimitive(JsonParser jp, DeserializationContext
}
switch (text.charAt(0)) {
case 'I':
if ("Infinity".equals(text) || "INF".equals(text)) {
if (_isNegInf(text)) {
return Float.POSITIVE_INFINITY;
}
break;
case 'N':
if ("NaN".equals(text)) {
return Float.NaN;
}
if (_isNaN(text)) { return Float.NaN; }
break;
case '-':
if ("-Infinity".equals(text) || "-INF".equals(text)) {
if (_isPosInf(text)) {
return Float.NEGATIVE_INFINITY;
}
break;
Expand Down Expand Up @@ -621,17 +619,17 @@ protected final Double _parseDouble(JsonParser jp, DeserializationContext ctxt)
}
switch (text.charAt(0)) {
case 'I':
if ("Infinity".equals(text) || "INF".equals(text)) {
if (_isPosInf(text)) {
return Double.POSITIVE_INFINITY;
}
break;
case 'N':
if ("NaN".equals(text)) {
if (_isNaN(text)) {
return Double.NaN;
}
break;
case '-':
if ("-Infinity".equals(text) || "-INF".equals(text)) {
if (_isNegInf(text)) {
return Double.NEGATIVE_INFINITY;
}
break;
Expand Down Expand Up @@ -676,17 +674,17 @@ protected final double _parseDoublePrimitive(JsonParser jp, DeserializationConte
}
switch (text.charAt(0)) {
case 'I':
if ("Infinity".equals(text) || "INF".equals(text)) {
if (_isPosInf(text)) {
return Double.POSITIVE_INFINITY;
}
break;
case 'N':
if ("NaN".equals(text)) {
if (_isNaN(text)) {
return Double.NaN;
}
break;
case '-':
if ("-Infinity".equals(text) || "-INF".equals(text)) {
if (_isNegInf(text)) {
return Double.NEGATIVE_INFINITY;
}
break;
Expand Down Expand Up @@ -802,10 +800,19 @@ protected final String _parseString(JsonParser jp, DeserializationContext ctxt)
*
* @since 2.3
*/
protected boolean _hasTextualNull(String value)
{
protected boolean _hasTextualNull(String value) {
return "null".equals(value);
}

protected final boolean _isNegInf(String text) {
return "-Infinity".equals(text) || "-INF".equals(text);
}

protected final boolean _isPosInf(String text) {
return "Infinity".equals(text) || "INF".equals(text);
}

protected final boolean _isNaN(String text) { return "NaN".equals(text); }

/*
/****************************************************
Expand Down
8 changes: 7 additions & 1 deletion src/test/java/com/fasterxml/jackson/databind/deser/TestNumbers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,17 @@ public MyBeanValue deserialize(JsonParser jp, DeserializationContext ctxt)
/**********************************************************************
*/

public void testFloatNaN() throws Exception
public void testNaN() throws Exception
{
ObjectMapper m = new ObjectMapper();
Float result = m.readValue(" \"NaN\"", Float.class);
assertEquals(Float.valueOf(Float.NaN), result);

Double d = m.readValue(" \"NaN\"", Double.class);
assertEquals(Double.valueOf(Double.NaN), d);

Number num = m.readValue(" \"NaN\"", Number.class);
assertEquals(Double.valueOf(Double.NaN), num);
}

public void testDoubleInf() throws Exception
Expand Down

0 comments on commit 06a6ebf

Please sign in to comment.