spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-10 03:19:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2016-10-02 11:08:33 +02:00
parent 75f475f2c8 4dfdce5a49
commit e643fc5bd1
11 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java
+1 -1
View File
@@ -78,7 +78,7 @@ public abstract class JsonObjectDeserializer<T>
/**
* Helper method to extract a value from the given {@code jsonNode} or return
* {@code null} when the node itself is {@code null}.
* @param jsonNode the source node (may be {@code null}
* @param jsonNode the source node (may be {@code null})
* @param type the data type. May be {@link String}, {@link Boolean}, {@link Long},
* {@link Integer}, {@link Short}, {@link Double}, {@link Float}, {@link BigDecimal}
* or {@link BigInteger}.