Merge pull request msgpack#207 from kutchar/fix-next-token-eof-exception

Fixing the contract of nextToken to be compliant with com.fasterxml.jackson.core.JsonParser.nextToken(), fixes msgpack#206

Author: komamitsu

msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java

@@ -118,6 +118,10 @@ public JsonToken nextToken() throws IOException, JsonParseException {
  }
  }
 
+ if (!messageUnpacker.hasNext()) {
+ return null;
+ }
+
  MessageFormat nextFormat = messageUnpacker.getNextFormat();
  ValueType valueType = nextFormat.getValueType();
 

msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
 
 public class MessagePackParserTest extends MessagePackDataformatTestBase {
  @Test
@@ -309,13 +310,8 @@ public void testMessagePackParserDirectly() throws IOException {
  assertEquals(-1, parser.getCurrentLocation().getLineNr());
  assertEquals(16, parser.getCurrentLocation().getColumnNr());
 
- try {
- parser.nextToken();
- assertTrue(false);
- }
- catch (EOFException e) {
- // Expected
- }
+ assertNull(parser.nextToken());
+
  parser.close();
  parser.close(); // Intentional
  }