Skip to content

#188: Fix for MessageBufferU #192

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 2 commits into from
Feb 2, 2015
Merged

#188: Fix for MessageBufferU #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27cb095
Fix MessageBufferU constructor to use full capacity of input ByteBuffer
xerial Feb 2, 2015
cff7d59
Add msgpack.universal-buffer option for testing MessageBufferU in Jav…
xerial Feb 2, 2015
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
3 changes: 2 additions & 1 deletion msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ public class MessageBuffer {
// We need to use reflection to find MessageBuffer implementation classes because
// importing these classes creates TypeProfile and adds some overhead to method calls.
String bufferClsName;
if(!isAndroid && isJavaAtLeast7) {
boolean useUniversalBuffer = Boolean.parseBoolean(System.getProperty("msgpack.universal-buffer", "false"));
Copy link
Member

@komamitsu komamitsu Feb 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

if(!useUniversalBuffer && !isAndroid && isJavaAtLeast7) {
if(isLittleEndian)
bufferClsName = "org.msgpack.core.buffer.MessageBuffer";
else
Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class MessageBufferU extends MessageBuffer {

MessageBufferU(ByteBuffer bb) {
super(null, 0L, bb.remaining(), bb.order(ByteOrder.BIG_ENDIAN));
super(null, 0L, bb.capacity(), bb.order(ByteOrder.BIG_ENDIAN));
checkNotNull(reference);
}

Expand Down