Fixing the contract of nextToken to be compliant with com.fasterxml.j…

…ackson.core.JsonParser.nextToken() and not throw an EOFException if at the end of the stream
kutchar · Mar 13, 2015 · 44be495 · 44be495
1 parent a788b01
commit 44be495
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java b/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();
 

diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java b/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
     }