Skip to content

Follow-up to #597 (wrt core#1434 and core#1438 changes) #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: [issue 768]FromXmlParser lacks extension point for custom XmlTokenStream
merged 1 commit into from
May 31, 2025
Merged

Follow-up to #597 (wrt core#1434 and core#1438 changes) #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions ...test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlNumberParsingGetType1433Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XsiNilBasic714Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down