Merge branch '2.12' into 2.13

Author: cowtowncoder

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

@@ -1391,6 +1391,10 @@ protected int _nextToken() throws IOException {
             return _xmlTokens.next();
         } catch (XMLStreamException e) {
             return StaxUtil.throwAsParseException(e, this);
+        } catch (IllegalStateException e) {
+            // 08-Apr-2021, tatu: Should improve on this, wrt better information
+            //   on issue.
+            throw new JsonParseException(this, e.getMessage(), e);
         }
     }
 

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

@@ -143,7 +143,7 @@ public class XmlTokenStream
      */
     protected String _nextLocalName;
     protected String _nextNamespaceURI;
-    
+
     /*
     /**********************************************************************
     /* Life-cycle
@@ -426,7 +426,8 @@ private final int _next() throws XMLStreamException
                     throw new IllegalStateException("Unexpected end-of-input after null token");
                 default:
                 }
-                throw new IllegalStateException("Unexpected START_ELEMENT after null token");
+                throw new IllegalStateException(
+"Unexpected START_ELEMENT after null token (inside element with 'xsi:nil' attribute)");
             }
             if (_nextAttributeIndex < _attributeCount) {
 //System.out.println(" XmlTokenStream._next(): Got attr(s)!");

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/XsiNilEnableDisable467Test.java

@@ -0,0 +1,23 @@
+package com.fasterxml.jackson.dataformat.xml.failing;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
+
+public class XsiNilEnableDisable467Test extends XmlTestBase
+{
+    private final static String XSI_NS_DECL = "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'";
+
+    private final XmlMapper MAPPER = newMapper();
+
+    // [databind#467] / [databind#467]: xsi:nil handling of nested elements etc
+    public void testNilAsNodeLeaf() throws Exception
+    {
+        JsonNode node = MAPPER.readTree(
+"<e>"
++"<h xmlns:xsi='"+XSI_NS_DECL+"' xsi:nil='true'><child /></h>"
++"</e>"
+                );
+        assertNotNull(node);
+    }
+}