Merge branch '2.6'

Author: cowtowncoder

release-notes/VERSION

@@ -9,7 +9,7 @@ Project: jackson-dataformat-xml
 #156: Add `XmlMapper.setDefaultUseWrapper()` for convenience.
 #169: Fail to deserialize "empty" polymorphic classes
 
-2.6.4 (not yet released)
+2.6.4 (07-Dec-2015)
 
 #171: `@JacksonXmlRootElement` malfunction in multi-thread environment
  (reported by Leo W)

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

@@ -0,0 +1,43 @@
+package com.fasterxml.jackson.dataformat.xml.failing;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
+
+// for [dataformat-xml#177]
+public class EmptyList177Test extends XmlTestBase
+{
+    static class Config
+    {
+        @JacksonXmlProperty(isAttribute=true)
+        public String id;
+        
+        @JacksonXmlElementWrapper(useWrapping=false)
+        public List<Entry> entry;
+    }
+
+    static class Entry
+    {
+        @JacksonXmlProperty(isAttribute=true)
+        public String id;
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final XmlMapper MAPPER = new XmlMapper();
+    
+    public void testEmptyList() throws Exception
+    {
+        Config r = MAPPER.readValue(
+                "<Config id='123'>\n"+
+                "  <entry id='foo'> </entry>\n"+
+                "</Config>\n",
+                Config.class);
+        assertNotNull(r);
+    }
+}