Merge pull request msgpack#374 from miniway/develop

xerial · web-flow · commit 1b67b5e35841 · 2016-07-20T11:25:27.000-07:00
Make MessageUnpacker.hasNext overridable
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -263,6 +263,12 @@ private static int utf8MultibyteCharacterSize(byte firstByte)
      */
     public boolean hasNext()
             throws IOException
+    {
+        return ensureBuffer();
+    }
+
+    private boolean ensureBuffer()
+            throws IOException
     {
         while (buffer.size() <= position) {
             MessageBuffer next = in.next();
@@ -290,7 +296,7 @@ public MessageFormat getNextFormat()
             throws IOException
     {
         // makes sure that buffer has at leat 1 byte
-        if (!hasNext()) {
+        if (!ensureBuffer()) {
             throw new MessageInsufficientBufferException();
         }
         byte b = buffer.getByte(position);
