Update release notes wrt #584

FasterXML · Mar 18, 2023 · 4b70c08 · 4b70c08
1 parent 0c6a4fb
commit 4b70c08
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -221,5 +221,11 @@ Joo Hyuk Kim (JooHyukKim@github)
 PJ Fanning (pjfanning@github)
 
 * Contributed fix for #533: (Android) java.lang.NoClassDefFoundError: Failed resolution
-   of: Ljavax/xml/stream/XMLInputFactory
+  of: Ljavax/xml/stream/XMLInputFactory
+ (2.15.0)
+
+Marco Belladelli (mbladel@github)
+
+* Contributed fix for #584: Deserialization of `null` String values in Arrays / `Collection`s
+  not working as expected
  (2.15.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -19,6 +19,9 @@ Project: jackson-dataformat-xml
   for XML pretty-printing
  (requested by @koalalam)
  (contributed by Joo Hyuk K)
+#584: Deserialization of `null` String values in Arrays / `Collection`s
+   not working as expected
+ (fix contributed by Marco B)
 
 2.14.2 (28-Jan-2023)
 

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
@@ -933,6 +933,11 @@ public String nextTextValue() throws IOException
         case XmlTokenStream.XML_END_ELEMENT:
             if (_mayBeLeaf) {
                 _mayBeLeaf = false;
+                // 18-Mar-2023, tatu: [dataformat-xml#584 / #585] in 2.14 and before
+                //    returned VALUE_STRING on assumption we never expose `null`s if
+                //    asked text value -- but that seems incorrect. Hoping this won't
+                //    break anything in 2.15+
+
                 _currToken = JsonToken.VALUE_NULL;
                 // 13-May-2020, tatu: [dataformat-xml#397]: advance `index`
                 _parsingContext.valueStarted();