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 7e723bdc..ccdf5889 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 @@ -521,6 +521,10 @@ public void close() throws IOException { if (!_closed) { _closed = true; + // 30-May-2025, tatu: was missing before 2.20 + if (JsonParser.Feature.CLEAR_CURRENT_TOKEN_ON_CLOSE.enabledIn(_features)) { + _currToken = null; + } try { if (_ioContext.isResourceManaged() || isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE)) { _xmlTokens.closeCompletely(); diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlNumberParsingGetType1433Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlNumberParsingGetType1433Test.java index 63a00bf5..ffaae244 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlNumberParsingGetType1433Test.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlNumberParsingGetType1433Test.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.dataformat.xml.*; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -35,8 +34,6 @@ void getNumberType() throws Exception assertEquals(JsonParser.NumberType.INT, p.getNumberType()); assertToken(JsonToken.END_OBJECT, p.nextToken()); _verifyGetNumberTypeFail(p, "END_OBJECT"); - assertNull(p.nextToken()); - _verifyGetNumberTypeFail(p, "null"); p.close(); _verifyGetNumberTypeFail(p, "null"); } diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNilBasic714Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNilBasic714Test.java index c91caa98..3b6f2c23 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNilBasic714Test.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNilBasic714Test.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.dataformat.xml.XmlTestUtil; -import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser; import static org.junit.jupiter.api.Assertions.*;