Merge branch '2.9' into 2.10

FasterXML · Nov 28, 2018 · 0efa55d · 0efa55d
2 parents b3e7c77 + 5c495f4
commit 0efa55d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/ParserNumbersTest.java b/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/ParserNumbersTest.java
@@ -341,7 +341,7 @@ public void testBigDecimalType() throws IOException {
             assertEquals(NR, parser.getDecimalValue());
             assertEquals(NR.doubleValue(), parser.getDoubleValue());
             assertEquals(NR.intValue(), parser.getIntValue());
-            assertEquals(JsonToken.END_OBJECT, parser.nextToken());
+            assertNull(parser.nextToken());
         }
         // Almost good. But [dataformats#139] to consider too...
         // ... but that'll need to wait for 2.10