Merge branch '2.6'

Conflicts:
	pom.xml
	release-notes/VERSION

Author: cowtowncoder

release-notes/VERSION

@@ -9,6 +9,10 @@ Project: jackson-dataformat-xml
 #156: Add `XmlMapper.setDefaultUseWrapper()` for convenience.
 #169: Fail to deserialize "empty" polymorphic classes
 
+2.6.5 (not yet released)
+
+#177: Failure to deserialize unwrapped list where entry has empty content, attribute(s)
+
 2.6.4 (07-Dec-2015)
 
 #171: `@JacksonXmlRootElement` malfunction in multi-thread environment

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

@@ -411,7 +411,7 @@ public boolean isExpectedStartArrayToken()
 //System.out.println(" isExpectedArrayStart: OBJ->Array, wraps now: "+_parsingContext.getNamesToWrap());
             // And just in case a field name was to be returned, wipe it
             _nextToken = null;
-            // and last thing, [Issue#33], better ignore attributes
+            // and last thing, [dataformat-xml#33], better ignore attributes
             _xmlTokens.skipAttributes();
             return true;
         }
@@ -422,7 +422,7 @@ public boolean isExpectedStartArrayToken()
     // DEBUGGING
     /*
     @Override
-    public JsonToken nextToken() throws IOException, JsonParseException
+    public JsonToken nextToken() throws IOException
     {
         JsonToken t = nextToken0();
         if (t != null) {
@@ -444,7 +444,7 @@ public JsonToken nextToken() throws IOException, JsonParseException
     @Override
     public JsonToken nextToken() throws IOException
     {
-        _binaryValue = null; // to fix [Issue-29]
+        _binaryValue = null;
         if (_nextToken != null) {
             JsonToken t = _nextToken;
             _currToken = t;
@@ -471,9 +471,8 @@ public JsonToken nextToken() throws IOException
         }
         int token = _xmlTokens.next();
 
-        /* Need to have a loop just because we may have to eat/convert
-         * a start-element that indicates an array element.
-         */
+        // Need to have a loop just because we may have to eat/convert
+        // a start-element that indicates an array element.
         while (token == XmlTokenStream.XML_START_ELEMENT) {
             // If we thought we might get leaf, no such luck
             if (_mayBeLeaf) {
@@ -483,28 +482,24 @@ public JsonToken nextToken() throws IOException
                 return (_currToken = JsonToken.START_OBJECT);
             }
             if (_parsingContext.inArray()) {
-                /* Yup: in array, so this element could be verified; but it won't be reported
-                 * anyway, and we need to process following event.
-                 */
+                // Yup: in array, so this element could be verified; but it won't be
+                // reported anyway, and we need to process following event.
                 token = _xmlTokens.next();
                 _mayBeLeaf = true;
                 continue;
             }
             String name = _xmlTokens.getLocalName();
             _parsingContext.setCurrentName(name);
 
-            /* Ok: virtual wrapping can be done by simply repeating
-             * current START_ELEMENT. Couple of ways to do it; but
-             * start by making _xmlTokens replay the thing...
-             */
+            // Ok: virtual wrapping can be done by simply repeating current START_ELEMENT.
+            // Couple of ways to do it; but start by making _xmlTokens replay the thing...
             if (_namesToWrap != null && _namesToWrap.contains(name)) {
                 _xmlTokens.repeatStartElement();
             }
 
             _mayBeLeaf = true;
-            /* Ok: in array context we need to skip reporting field names. But what's the best way
-             * to find next token?
-             */
+            // Ok: in array context we need to skip reporting field names.
+            // But what's the best way to find next token?
             return (_currToken = JsonToken.FIELD_NAME);
         }
 
@@ -555,8 +550,17 @@ public JsonToken nextToken() throws IOException
                     }
                 }
                 return (_currToken = JsonToken.VALUE_STRING);
+            } else {
+                // [dataformat-xml#177]: empty text may also need to be skipped
+                if (_parsingContext.inObject()
+                        && (_currToken != JsonToken.FIELD_NAME) && _isEmpty(_currText)) {
+                    _currToken = JsonToken.END_OBJECT;
+                    _parsingContext = _parsingContext.getParent();
+                    _namesToWrap = _parsingContext.getNamesToWrap();
+                    return _currToken;
+                }
             }
-            // If not a leaf, need to transform into property...
+            // If not a leaf (or otherwise ignorable), need to transform into property...
             _parsingContext.setCurrentName(_cfgNameForTextElement);
             _nextToken = JsonToken.VALUE_STRING;
             return (_currToken = JsonToken.FIELD_NAME);

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/EmptyList177Test.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/lists/EmptyListDeserTest.java

@@ -1,12 +1,12 @@
-package com.fasterxml.jackson.dataformat.xml.failing;
+package com.fasterxml.jackson.dataformat.xml.lists;
 
 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
+public class EmptyListDeserTest extends XmlTestBase
 {
     static class Config
     {