0xC1 NEVER_USED always throws MessageNeverUsedFormatException regardless of context rather than MessageTypeException or MessageFormatException depending on context

frsyuki · komamitsu · commit 634fdd862904 · 2015-12-27T17:48:21.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
@@ -449,7 +449,7 @@ public void skipValue()
                     remainingValues += readNextLength32() * 2; // TODO check int overflow
                     break;
                 case NEVER_USED:
-                    throw new MessageFormatException(String.format("unknown code: %02x is found", b));
+                    throw new MessageNeverUsedFormatException("Encountered 0xC1 \"NEVER_USED\" byte");
             }
 
             remainingValues--;
@@ -464,19 +464,17 @@ public void skipValue()
      * @return
      * @throws MessageFormatException
      */
-    private static MessageTypeException unexpected(String expected, byte b)
-            throws MessageTypeException
+    private static MessagePackException unexpected(String expected, byte b)
     {
         MessageFormat format = MessageFormat.valueOf(b);
-        String typeName;
         if (format == MessageFormat.NEVER_USED) {
-            typeName = "NeverUsed";
+            return new MessageNeverUsedFormatException(String.format("Expected %s, but encountered 0xC1 \"NEVER_USED\" byte", expected));
         }
         else {
             String name = format.getValueType().name();
-            typeName = name.substring(0, 1) + name.substring(1).toLowerCase();
+            String typeName = name.substring(0, 1) + name.substring(1).toLowerCase();
+            return new MessageTypeException(String.format("Expected %s, but got %s (%02x)", expected, typeName, b));
         }
-        return new MessageTypeException(String.format("Expected %s, but got %s (%02x)", expected, typeName, b));
     }
 
     public ImmutableValue unpackValue()
@@ -530,7 +528,7 @@ public ImmutableValue unpackValue()
                 return ValueFactory.newExtension(extHeader.getType(), readPayload(extHeader.getLength()));
             }
             default:
-                throw new MessageFormatException("Unknown value type");
+                throw new MessageNeverUsedFormatException("Unknown value type");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ public void skipValue()`
`449`	`449`	`remainingValues += readNextLength32() * 2; // TODO check int overflow`
`450`	`450`	`break;`
`451`	`451`	`case NEVER_USED:`
`452`		`- throw new MessageFormatException(String.format("unknown code: %02x is found", b));`
	`452`	`+ throw new MessageNeverUsedFormatException("Encountered 0xC1 \"NEVER_USED\" byte");`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`remainingValues--;`
`@@ -464,19 +464,17 @@ public void skipValue()`
`464`	`464`	`* @return`
`465`	`465`	`* @throws MessageFormatException`
`466`	`466`	`*/`
`467`		`- private static MessageTypeException unexpected(String expected, byte b)`
`468`		`- throws MessageTypeException`
	`467`	`+ private static MessagePackException unexpected(String expected, byte b)`
`469`	`468`	`{`
`470`	`469`	`MessageFormat format = MessageFormat.valueOf(b);`
`471`		`- String typeName;`
`472`	`470`	`if (format == MessageFormat.NEVER_USED) {`
`473`		`- typeName = "NeverUsed";`
	`471`	`+ return new MessageNeverUsedFormatException(String.format("Expected %s, but encountered 0xC1 \"NEVER_USED\" byte", expected));`
`474`	`472`	`}`
`475`	`473`	`else {`
`476`	`474`	`String name = format.getValueType().name();`
`477`		`- typeName = name.substring(0, 1) + name.substring(1).toLowerCase();`
	`475`	`+ String typeName = name.substring(0, 1) + name.substring(1).toLowerCase();`
	`476`	`+ return new MessageTypeException(String.format("Expected %s, but got %s (%02x)", expected, typeName, b));`
`478`	`477`	`}`
`479`		`- return new MessageTypeException(String.format("Expected %s, but got %s (%02x)", expected, typeName, b));`
`480`	`478`	`}`
`481`	`479`
`482`	`480`	`public ImmutableValue unpackValue()`
`@@ -530,7 +528,7 @@ public ImmutableValue unpackValue()`
`530`	`528`	`return ValueFactory.newExtension(extHeader.getType(), readPayload(extHeader.getLength()));`
`531`	`529`	`}`
`532`	`530`	`default:`
`533`		`- throw new MessageFormatException("Unknown value type");`
	`531`	`+ throw new MessageNeverUsedFormatException("Unknown value type");`
`534`	`532`	`}`
`535`	`533`	`}`
`536`	`534`