From 648d5f9c78858d389e10a2a2d930b578e9042d29 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 7 Sep 2019 16:25:53 -0700
Subject: [PATCH] Minor fix wrt #353

---
 .../dataformat/xml/deser/FromXmlParser.java     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
index 0cd2ca1dd..423f14e01 100644
--- a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
+++ b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
@@ -472,7 +472,7 @@ public JsonToken nextToken() throws IOException
         return t;
     }
     */
-    
+
 //    public JsonToken nextToken0() throws IOException
     @Override
     public JsonToken nextToken() throws IOException
@@ -558,7 +558,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();
@@ -636,6 +639,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.