Skip to content

Fix wrong convertion fron long to int #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komamitsu merged 1 commit into from
May 29, 2015
Merged

Fix wrong convertion fron long to int #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public BigDecimal getDecimalValue() throws IOException {
NumberValue number = ref.asNumber();
//optimization to not convert the value to BigInteger unnecessarily
if (number.isValidByte() || number.isValidShort() || number.isValidInt() || number.isValidLong()) {
return BigDecimal.valueOf(number.asInt());
return BigDecimal.valueOf(number.asLong());
}
else {
return new BigDecimal(number.asBigInteger());
Expand Down
13 changes: 13 additions & 0 deletions msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -373,4 +374,16 @@ public void testDisableFeatureAutoCloseSource() throws IOException {
objectMapper.readValue(in, new TypeReference<List<Integer>>() {});
objectMapper.readValue(in, new TypeReference<List<Integer>>() {});
}

@Test
public void testParseBigDecimal() throws IOException {
ArrayList<BigDecimal> list = new ArrayList<BigDecimal>();
list.add(new BigDecimal(Long.MAX_VALUE));
ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
byte[] bytes = objectMapper.writeValueAsBytes(list);

ArrayList<BigDecimal> result = objectMapper.readValue(
bytes, new TypeReference<ArrayList<BigDecimal>>() {});
assertEquals(list, result);
}
}