Skip to content

Commit fc337c4

Browse files
committed
Merge branch '2.16' into 2.17
2 parents bf17b69 + 01fd701 commit fc337c4

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package com.fasterxml.jackson.dataformat.ion.failing;
1+
package com.fasterxml.jackson.dataformat.ion;
22

33
import java.net.URL;
44

55
import org.junit.Test;
66

7-
import com.fasterxml.jackson.core.JsonProcessingException;
8-
import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
7+
import com.fasterxml.jackson.core.exc.StreamReadException;
98

109
import static org.junit.Assert.*;
1110

12-
public class UncaughtException303Test
11+
public class DatabindRead303Test
1312
{
1413
private final IonObjectMapper MAPPER = IonObjectMapper.builder().build();
1514

@@ -21,9 +20,10 @@ public void testUncaughtException303() throws Exception
2120
try {
2221
MAPPER.readTree(poc);
2322
fail("Should not pass with invalid content");
24-
} catch (JsonProcessingException e) {
25-
// !!! TODO: change to match what we actually expect
26-
verifyException(e, "MATCH MESSAGE");
23+
} catch (StreamReadException e) {
24+
// 19-Dec-2023, tatu: Looks like message depends on ion-java version,
25+
// cannot easily verify
26+
// verifyException(e, "Value exceeds the length of its parent container");
2727
}
2828
}
2929

release-notes/VERSION-2.x

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ Active maintainers:
2828
(fix contributed by Arthur C)
2929
-(ion) Update `com.amazon.ion:ion-java` to 1.11.0 (from 1.10.5)
3030

31+
2.16.1 (not yet released)
32+
33+
#303: `NullPointerException` in `IonParser.nextToken()`
34+
(reported by @ZanderHuang)
35+
3136
2.16.0 (15-Nov-2023)
3237

3338
#400: (avro) Rewrite Avro buffer recycling (`ApacheCodecRecycler.java`) to

0 commit comments

Comments
 (0)