bug fixed for float/double to int/long.

alibaba · Aug 16, 2018 · ee5c008 · ee5c008
1 parent 14343b0
commit ee5c008
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/serializer/IntegerCodec.java b/src/main/java/com/alibaba/fastjson/serializer/IntegerCodec.java
@@ -82,9 +82,9 @@ public <T> T deserialze(DefaultJSONParser parser, Type clazz, Object fieldName)
                 lexer.nextToken(JSONToken.COMMA);
                 intObj = Integer.valueOf(val);
             } else if (token == JSONToken.LITERAL_FLOAT) {
-                BigDecimal decimalValue = lexer.decimalValue();
+                Number number = lexer.decimalValue(false);
+                intObj = number.intValue();
                 lexer.nextToken(JSONToken.COMMA);
-                intObj = Integer.valueOf(decimalValue.intValue());
             } else {
                 if (token == JSONToken.LBRACE) {
                     JSONObject jsonObject = new JSONObject(true);

diff --git a/src/main/java/com/alibaba/fastjson/serializer/LongCodec.java b/src/main/java/com/alibaba/fastjson/serializer/LongCodec.java
@@ -64,6 +64,10 @@ public <T> T deserialze(DefaultJSONParser parser, Type clazz, Object fieldName)
                 long longValue = lexer.longValue();
                 lexer.nextToken(JSONToken.COMMA);
                 longObject = Long.valueOf(longValue);
+            } else if (token == JSONToken.LITERAL_FLOAT) {
+                Number number = lexer.decimalValue(false);
+                longObject = number.longValue();
+                lexer.nextToken(JSONToken.COMMA);
             } else {
                 if (token == JSONToken.LBRACE) {
                     JSONObject jsonObject = new JSONObject(true);