msgpack#100: Throwing EOFException when incoming data size is insufficient

xerial · xerial · commit f1ce805c0afb · 2014-05-29T12:33:14.000+09: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
@@ -320,7 +320,7 @@ private void consume(int numBytes) throws IOException {
      */
     private byte readByte() throws IOException {
         if(!ensure(1)) {
-            throw new MessageFormatException("insufficient data length for reading byte value");
+            throw new EOFException("insufficient data length for reading byte value");
         }
         byte b = buffer.getByte(position);
         consume(1);
@@ -329,7 +329,7 @@ private byte readByte() throws IOException {
 
     private short readShort() throws IOException {
         if(!ensure(2)) {
-            throw new MessageFormatException("insufficient data length for reading short value");
+            throw new EOFException("insufficient data length for reading short value");
         }
         short s = buffer.getShort(position);
         consume(2);
@@ -338,7 +338,7 @@ private short readShort() throws IOException {
 
     private int readInt() throws IOException {
         if(!ensure(4)) {
-            throw new MessageFormatException("insufficient data length for reading int value");
+            throw new EOFException("insufficient data length for reading int value");
         }
         int i = buffer.getInt(position);
         consume(4);
@@ -347,7 +347,7 @@ private int readInt() throws IOException {
 
     private float readFloat() throws IOException {
         if(!ensure(4)) {
-            throw new MessageFormatException("insufficient data length for reading float value");
+            throw new EOFException("insufficient data length for reading float value");
         }
         float f = buffer.getFloat(position);
         consume(4);
@@ -356,7 +356,7 @@ private float readFloat() throws IOException {
 
     private long readLong() throws IOException {
         if(!ensure(8)) {
-            throw new MessageFormatException("insufficient data length for reading long value");
+            throw new EOFException("insufficient data length for reading long value");
         }
         long l = buffer.getLong(position);
         consume(8);
@@ -365,7 +365,7 @@ private long readLong() throws IOException {
 
     private double readDouble() throws IOException {
         if(!ensure(8)) {
-            throw new MessageFormatException("insufficient data length for reading double value");
+            throw new EOFException("insufficient data length for reading double value");
         }
         double d = buffer.getDouble(position);
         consume(8);
@@ -386,13 +386,17 @@ public void skipBytes(int numBytes) throws IOException {
     }
 
     /**
-     * Skip the next value, then move the cursor at the end of that value
+     * Skip the next value, then move the cursor at the end of the value
      *
      * @throws IOException
      */
     public void skipValue() throws IOException {
         int remainingValues = 1;
-        while(!reachedEOF && remainingValues > 0) {
+        while(remainingValues > 0) {
+            if(reachedEOF) {
+                throw new EOFException();
+            }
+
             MessageFormat f = getNextFormat();
             byte b = consume();
             switch(f) {
@@ -503,7 +507,7 @@ public void skipValue() throws IOException {
      * @throws MessageFormatException
      */
     private static MessageTypeException unexpected(String expected, byte b)
-            throws MessageFormatException {
+            throws MessageTypeException {
         ValueType type = ValueType.valueOf(b);
         return new MessageTypeException(String.format("Expected %s, but got %s (%02x)", expected, type.toTypeName(), b));
     }
