Minor improvements to error handling, trying to address FasterXML#226 (eventually)

Author: cowtowncoder

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

@@ -601,11 +601,7 @@ public JsonToken nextToken() throws IOException
                     // we had an empty String (or all white space), and we are
                     // deserializing an array, we better hide the empty text.
                     // Also: must skip following END_ELEMENT
-                    try {
-                        _xmlTokens.skipEndElement();
-                    } catch (XMLStreamException e) {
-                        StaxUtil.throwAsParseException(e, this);
-                    }
+                    _skipEndElement();
                     if (_parsingContext.inArray()) {
                         if (XmlTokenStream._allWs(_currText)) {
                             // 06-Jan-2015, tatu: as per [dataformat-xml#180], need to
@@ -755,11 +751,7 @@ public String nextTextValue() throws IOException
             if (_mayBeLeaf) {
                 _mayBeLeaf = false;
                 // Also: must skip following END_ELEMENT
-                try {
-                    _xmlTokens.skipEndElement();
-                } catch (XMLStreamException e) {
-                    StaxUtil.throwAsParseException(e, this);
-                }
+                _skipEndElement();
                 // NOTE: this is different from nextToken() -- NO work-around
                 // for otherwise empty List/array
                 // 13-May-2020, tatu: [dataformat-xml#397]: advance `index`
@@ -856,11 +848,7 @@ public String getValueAsString(String defValue) throws IOException
                     _currToken = JsonToken.VALUE_STRING;
                     _nextToken = null;
                     // One more thing: must explicitly skip the END_OBJECT that would follow
-                    try {
-                        _xmlTokens.skipEndElement();
-                    } catch (XMLStreamException e) {
-                        StaxUtil.throwAsParseException(e, this);
-                    }
+                    _skipEndElement();
                     return (_currText = str);
                 }
             } catch (XMLStreamException e) {
@@ -1056,7 +1044,17 @@ protected ByteArrayBuilder _getByteArrayBuilder()
         return _byteArrayBuilder;
     }
 
-    private <T> T  _internalErrorUnknownToken(Object token) {
+    private <T> T _internalErrorUnknownToken(Object token) {
         throw new IllegalStateException("Internal error: unrecognized XmlTokenStream token: "+token);
     }
+
+    protected void _skipEndElement() throws IOException {
+        try {
+            _xmlTokens.skipEndElement();
+        } catch (XMLStreamException e) {
+            StaxUtil.throwAsParseException(e, this);
+        } catch (Exception e) {
+            throw new JsonParseException(this, e.getMessage(), e);
+        }
+    }
 }

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

@@ -213,7 +213,9 @@ public void skipEndElement() throws IOException, XMLStreamException
     {
         int type = next();
         if (type != XML_END_ELEMENT) {
-            throw new IOException("Expected END_ELEMENT, got event of type "+type);
+            throw new IOException(String.format(
+                    "Internal error: Expected END_ELEMENT (%d), got event of type %d",
+                    XML_END_ELEMENT, type));
         }
     }
 

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

@@ -13,7 +13,10 @@ public class MixedContentTreeRead226Test extends XmlTestBase
 
     public void testMixed226() throws Exception
     {
-        final String XML = "<root>\n<a>lorem <b>ipsum</b> dolor</a>\n</root>";
+        final String XML = "<root>\n"
+                +"<a>lorem <b>ipsum</b>\n"
+                +"dolor</a>\n"
+                +"</root>";
         JsonNode root = MAPPER.readTree(XML);
         assertNotNull(root);
     }