Skip to content

Commit 70e138b

Browse files
committed
Update release notes wrt #2541
1 parent 91782dc commit 70e138b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

release-notes/CREDITS-2.x

+8
Original file line numberDiff line numberDiff line change
@@ -1461,3 +1461,11 @@ Jan Judas (kostislav@github)
14611461
Deniz Husaj (denizhusaj@github)
14621462
* Reported #3447: Deeply nested JsonNode throws StackOverflowError for toString()
14631463
(2.14.0)
1464+
1465+
Matthew Altman (matthew-altman@github)
1466+
* Reported #2541: Cannot merge polymorphic objects
1467+
(2.14.0)
1468+
1469+
James Wang (jameswangz@github)
1470+
* Contributed fix for #2541: Cannot merge polymorphic objects
1471+
(2.14.0)

release-notes/VERSION-2.x

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Project: jackson-databind
66

77
2.14.0 (not yet released)
88

9+
#2541: Cannot merge polymorphic objects
10+
(reported by Matthew A)
11+
(fix contributed by James W)
912
#3357: `@JsonIgnore` does not if together with `@JsonProperty` or `@JsonFormat`
1013
(reported by lizongbo@github)
1114
#3373: Change `TypeSerializerBase` to skip `generator.writeTypePrefix()`

src/main/java/com/fasterxml/jackson/databind/util/ClassUtil.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,8 @@ public static void unwrapAndThrowAsIAE(Throwable t, String msg)
489489
public static void closeOnFailAndThrowAsIOE(JsonGenerator g, Exception fail)
490490
throws IOException
491491
{
492-
/* 04-Mar-2014, tatu: Let's try to prevent auto-closing of
493-
* structures, which typically causes more damage.
494-
*/
492+
// 04-Mar-2014, tatu: Let's try to prevent auto-closing of
493+
// structures, which typically causes more damage.
495494
g.disable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT);
496495
try {
497496
g.close();

0 commit comments

Comments
 (0)