Skip to content

Commit 4b70c08

Browse files
committed
Update release notes wrt #584
1 parent 0c6a4fb commit 4b70c08

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

release-notes/CREDITS-2.x

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,11 @@ Joo Hyuk Kim (JooHyukKim@github)
221221
PJ Fanning (pjfanning@github)
222222

223223
* Contributed fix for #533: (Android) java.lang.NoClassDefFoundError: Failed resolution
224-
of: Ljavax/xml/stream/XMLInputFactory
224+
of: Ljavax/xml/stream/XMLInputFactory
225+
(2.15.0)
226+
227+
Marco Belladelli (mbladel@github)
228+
229+
* Contributed fix for #584: Deserialization of `null` String values in Arrays / `Collection`s
230+
not working as expected
225231
(2.15.0)

release-notes/VERSION-2.x

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ Project: jackson-dataformat-xml
1919
for XML pretty-printing
2020
(requested by @koalalam)
2121
(contributed by Joo Hyuk K)
22+
#584: Deserialization of `null` String values in Arrays / `Collection`s
23+
not working as expected
24+
(fix contributed by Marco B)
2225

2326
2.14.2 (28-Jan-2023)
2427

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,11 @@ public String nextTextValue() throws IOException
933933
case XmlTokenStream.XML_END_ELEMENT:
934934
if (_mayBeLeaf) {
935935
_mayBeLeaf = false;
936+
// 18-Mar-2023, tatu: [dataformat-xml#584 / #585] in 2.14 and before
937+
// returned VALUE_STRING on assumption we never expose `null`s if
938+
// asked text value -- but that seems incorrect. Hoping this won't
939+
// break anything in 2.15+
940+
936941
_currToken = JsonToken.VALUE_NULL;
937942
// 13-May-2020, tatu: [dataformat-xml#397]: advance `index`
938943
_parsingContext.valueStarted();

0 commit comments

Comments
 (0)