Skip to content

msgpack-value v07 API #109

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

Closed
xerial wants to merge 10 commits into from
Closed

msgpack-value v07 API #109

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9dae25e
#109: Applied fixes suggested by @komamitsu
xerial Jun 23, 2014
a6619fb
#109: Add a case for BINARY type in toByteBuffer
xerial Jun 30, 2014
698a92c
#109: Add comment to MessageOverflowException
xerial Jun 30, 2014
64d397c
#109: Simply convert to uint32 (long) value using a bit mask
xerial Jun 30, 2014
a2881a5
Merge branch 'v07-develop' into v07-value
xerial Nov 28, 2014
d655c03
0.7.0-M6-SNAPSHOT vesrion
xerial Nov 28, 2014
7a94130
Remove ValueRef interface
xerial Nov 28, 2014
84ac459
isImmutable is false for Array/MapCursor
xerial Nov 28, 2014
52342fe
Make Map/ArrayCursorImpl implement Value interface
xerial Nov 28, 2014
ad0bbbe
Adjust benchmark
xerial Nov 28, 2014
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
Prev Previous commit
Next Next commit
#109: Simply convert to uint32 (long) value using a bit mask
  • Loading branch information
@xerial
xerial committed Jun 30, 2014
commit 64d397ca19d05c8d3328e3aa984af97c893c890c
10 changes: 5 additions & 5 deletions msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ public long unpackLong() throws IOException {
case Code.UINT32: // unsigned int 32
int u32 = readInt();
if(u32 < 0) {
return (long) (u32 & 0x7fffffff) + 0x80000000L;
return u32 & 0xffffffffL;
} else {
return (long) u32;
}
Expand Down Expand Up @@ -814,7 +814,7 @@ public BigInteger unpackBigInteger() throws IOException {
case Code.UINT32: // unsigned int 32
int u32 = readInt();
if(u32 < 0) {
return BigInteger.valueOf((long) (u32 & 0x7fffffff) + 0x80000000L);
return BigInteger.valueOf(u32 & 0xffffffffL);
} else {
return BigInteger.valueOf((long) u32);
}
Expand Down Expand Up @@ -890,7 +890,7 @@ public void unpackInteger(IntegerHolder holder) throws IOException {
case Code.UINT32: // unsigned int 32
int u32 = readInt();
if(u32 < 0) {
holder.setLong((long) (u32 & 0x7fffffff) + 0x80000000L);
holder.setLong(u32 & 0xffffffffL);
} else {
holder.setInt(u32);
}
Expand Down Expand Up @@ -1225,7 +1225,7 @@ private static MessageIntegerOverflowException overflowU16(short u16) {
}

private static MessageIntegerOverflowException overflowU32(int u32) {
BigInteger bi = BigInteger.valueOf((long) (u32 & 0x7fffffff) + 0x80000000L);
BigInteger bi = BigInteger.valueOf(u32 & 0xffffffffL);
return new MessageIntegerOverflowException(bi);
}

Expand All @@ -1250,7 +1250,7 @@ private static MessageIntegerOverflowException overflowI64(long i64) {
}

private static MessageSizeException overflowU32Size(int u32) {
long lv = (long) (u32 & 0x7fffffff) + 0x80000000L;
long lv = u32 & 0xffffffffL;
return new MessageSizeException(lv);
}

Expand Down