Merge remote-tracking branch 'origin/fix-number-buffer' into number-buffer-boundary-test

xerial · xerial · commit 17e10b941f28 · 2016-04-19T16:13:28.000-07:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -208,36 +208,44 @@ private MessageBuffer prepareNumberBuffer(int readLength)
             position += readLength;  // here assumes following buffer.getXxx never throws exception
             return buffer; // Return the default buffer
         }
-        else if (remaining == 0) {
-            buffer = getNextBuffer();
-            position = readLength;
-            nextReadPosition = 0;
-            return buffer;
-        }
         else {
-            // When the default buffer doesn't contain the whole length
-
-            // TODO This doesn't work if MessageBuffer is allocated by newDirectBuffer.
-            //      Add copy method to MessageBuffer to solve this issue.
-
-            // Copy the data fragment from the current buffer
-
-            numberBuffer.putBytes(0,
-                                  buffer.array(), buffer.arrayOffset() + position,
-                                  remaining);
-
-            // TODO loop this method until castBuffer is filled
-            MessageBuffer next = getNextBuffer();
+            // When the default buffer doesn't contain the whole length,
+            // fill the temporary buffer from the current data fragment and
+            // next fragment(s).
+
+            // TODO buffer.array() doesn't work if MessageBuffer is allocated by
+            //      newDirectBuffer. dd copy method to MessageBuffer to solve this issue.
+
+            int off = 0;
+            if (remaining > 0) {
+                numberBuffer.putBytes(0,
+                        buffer.array(), buffer.arrayOffset() + position,
+                        remaining);
+                readLength -= remaining;
+                off += remaining;
+            }
 
-            numberBuffer.putBytes(remaining,
-                                  next.array(), next.arrayOffset(),
-                                  readLength - remaining);
+            while (true) {
+                nextBuffer();
+                int nextSize = buffer.size();
+                if (nextSize >= readLength) {
+                    numberBuffer.putBytes(off,
+                            buffer.array(), buffer.arrayOffset(),
+                            readLength);
+                    position = readLength;
+                    break;
+                }
+                else {
+                    numberBuffer.putBytes(off,
+                            buffer.array(), buffer.arrayOffset(),
+                            nextSize);
+                    readLength -= nextSize;
+                    off += nextSize;
+                }
+            }
 
-            buffer = next;
-            position = readLength - remaining;
             nextReadPosition = 0;
-
-            return numberBuffer; // Return the numberBuffer
+            return numberBuffer;
         }
     }
 
