Fix #167

Author: cowtowncoder

release-notes/VERSION

@@ -7,6 +7,7 @@ Project: jackson-dataformat-xml
 2.7.0 (not yet released)
 
 #156: Add `XmlMapper.setDefaultUseWrapper()` for convenience.
+#167: Exception on deserializing empty element with an xsi attribute
 #169: Fail to deserialize "empty" polymorphic classes
 
 2.6.5 (not yet released)

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

@@ -270,7 +270,12 @@ protected String convertToString() throws IOException
         }
         try {
             String text = _collectUntilTag();
-            if (text != null && _xmlReader.getEventType() == XMLStreamReader.END_ELEMENT) {
+            // 23-Dec-2015, tatu: Used to require text not to be null, but as per
+            //   [dataformat-xml#167], empty tag does count
+            if (_xmlReader.getEventType() == XMLStreamReader.END_ELEMENT) {
+                if (text == null) {
+                    text = "";
+                }
                 if (_currentWrapper != null) {
                     _currentWrapper = _currentWrapper.getParent();
                 }

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/TestStringValues.java

@@ -15,6 +15,10 @@ public String toString() {
         }
     }
 
+    static class Issue167Bean {
+        public String d;
+    }
+
     /*
     /**********************************************************
     /* Unit tests
@@ -90,4 +94,15 @@ public void testStringArrayWithAttribute() throws Exception
         assertEquals("Bulla", beans[1].text);
         assertEquals("Good stuff", beans[2].text);
     }
+
+    public void testEmptyElementToString() throws Exception
+    {
+        final String XML =
+"<a xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n"+
+"<d xsi:nil='true'/>\n"+
+"</a>\n";
+        Issue167Bean result = MAPPER.readValue(XML, Issue167Bean.class);
+        assertNotNull(result);
+        assertEquals("", result.d);
+    }
 }