Merge v07-develop

xerial · xerial · commit 1cd7eac97425 · 2015-01-19T10:12:02.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java
@@ -41,14 +41,19 @@ public class MessageBuffer {
                 isJavaAtLeast7 = false;
             }
             else {
-                int major = Integer.parseInt(javaVersion.substring(0, dotPos));
-                int minor = Integer.parseInt(javaVersion.substring(dotPos + 1));
-                isJavaAtLeast7 = major > 1 || (major == 1 && minor >= 7);
+                try {
+                    int major = Integer.parseInt(javaVersion.substring(0, dotPos));
+                    int minor = Integer.parseInt(javaVersion.substring(dotPos + 1));
+                    isJavaAtLeast7 = major > 1 || (major == 1 && minor >= 7);
+                }
+                catch(NumberFormatException e) {
+                    e.printStackTrace(System.err);
+                }
             }
 
-            // Fetch theUnsafe object for Orackle JDK and OpenJDK
             // Detect android VM
             boolean isAndroid = System.getProperty("java.runtime.name", "").toLowerCase().contains("android");
+            // Fetch theUnsafe object for Orackle JDK and OpenJDK
             Unsafe u;
             if(!isAndroid) {
                 // Fetch theUnsafe object for Oracle JDK and OpenJDK
@@ -111,6 +116,8 @@ public class MessageBuffer {
                     assert false;
             }
 
+            // 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) {
                 if(isLittleEndian)
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java
@@ -75,7 +75,7 @@ public double getDouble(int index) {
     public void getBytes(int index, int len, ByteBuffer dst) {
         try {
             reference.position(index);
-            reference.limit(index+len);
+            reference.limit(index + len);
             dst.put(reference);
         }
         finally {
@@ -114,7 +114,7 @@ public void putDouble(int index, double v) {
     public ByteBuffer toByteBuffer(int index, int length) {
         try {
             reference.position(index);
-            reference.limit(index+length);
+            reference.limit(index + length);
             return reference.slice();
         }
         finally {
@@ -142,15 +142,19 @@ public void putByteBuffer(int index, ByteBuffer src, int len) {
         assert (len <= src.remaining());
 
         if(src.hasArray()) {
-            byte[] srcArray = src.array();
-            putBytes(index, srcArray, src.position(), len);
-
-        } else {
-            for(int i = 0; i < len; ++i) {
-                putByte(index + i, src.get());
+            putBytes(index, src.array(), src.position(), len);
+            src.position(src.position() + len);
+        }
+        else {
+            int prevSrcLimit = src.limit();
+            try {
+                src.limit(src.position() + len);
+                reference.put(src);
+            }
+            finally {
+                src.limit(prevSrcLimit);
             }
         }
-        src.position(src.position() + len);
     }
 
     @Override
diff --git a/msgpack-jackson/README.md b/msgpack-jackson/README.md
@@ -11,7 +11,7 @@ To use this module on Maven-based projects, use following dependency:
 <dependency>
   <groupId>org.msgpack</groupId>
   <artifactId>jackson-dataformat-msgpack</artifactId>
-  <version>0.7.0-p2</version>
+  <version>0.7.0-p3</version>
 </dependency>
 ```
 
