Merge pull request #192 from xerial/v07-develop

#188: Fix for MessageBufferU

Author: komamitsu

msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java

@@ -143,7 +143,8 @@ enum DirectBufferConstructorType {
             // 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"));
+            if(!useUniversalBuffer && !isAndroid && isJavaAtLeast7) {
                 if(isLittleEndian)
                     bufferClsName = "org.msgpack.core.buffer.MessageBuffer";
                 else

msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java

@@ -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);
     }