Merge branch '2.10'

Author: cowtowncoder

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

@@ -458,7 +458,7 @@ public JsonToken nextToken() throws IOException
         return t;
     }
     */
-    
+
 //    public JsonToken nextToken0() throws IOException
     @Override
     public JsonToken nextToken() throws IOException
@@ -544,7 +544,10 @@ public JsonToken nextToken() throws IOException
                         _parsingContext = _parsingContext.createChildObjectContext(-1, -1);
                         return (_currToken = JsonToken.START_OBJECT);
                     }
-                    return (_currToken = JsonToken.VALUE_NULL);
+                    // 07-Sep-2019, tatu: for [dataformat-xml#353], must NOT return second null
+                    if (_currToken != JsonToken.VALUE_NULL) {
+                        return (_currToken = JsonToken.VALUE_NULL);
+                    }
                 }
                 _currToken = _parsingContext.inArray() ? JsonToken.END_ARRAY : JsonToken.END_OBJECT;
                 _parsingContext = _parsingContext.getParent();
@@ -622,6 +625,16 @@ public JsonToken nextToken() throws IOException
     /**********************************************************************
      */
 
+    /*
+    @Override
+    public String nextFieldName() throws IOException {
+        if (nextToken() == JsonToken.FIELD_NAME) {
+            return getCurrentName();
+        }
+        return null;
+    }
+    */
+
     /**
      * Method overridden to support more reliable deserialization of
      * String collections.

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

@@ -189,6 +189,9 @@ public int next() throws XMLStreamException
         case XML_TEXT: 
             System.out.println(" XML-token: XML_TEXT '"+_textValue+"'");
             break;
+        case XML_NULL: 
+            System.out.println(" XML-token: XML_NULL");
+            break;
         case XML_END: 
             System.out.println(" XML-token: XML_END");
             break;