Merge branch '2.7'

FasterXML · Sep 1, 2016 · ee10eec · ee10eec
2 parents 1ca7576 + 1d930db
commit ee10eec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -84,7 +84,11 @@ Project: jackson-databind
 #1277: Add caching of resolved generic types for `TypeFactory`
  (requested by Andriy P)
 
-2.7.7 (not yet released)
+2.7.8 (not yet released)
+
+#1359: Improve `JsonNode` deserializer to create `FloatNode` if parser supports
+
+2.7.7 (27-Aug-2016)
 
 #1322: EnumMap keys not using enum's `@JsonProperty` values unlike Enum values
  (reported by MichaelChambers@github)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java
@@ -380,6 +380,9 @@ protected final JsonNode _fromFloat(JsonParser p, DeserializationContext ctxt,
             }
             return nodeFactory.numberNode(p.getDecimalValue());
         }
+        if (nt == JsonParser.NumberType.FLOAT) {
+            return nodeFactory.numberNode(p.getFloatValue());
+        }
         return nodeFactory.numberNode(p.getDoubleValue());
     }