Skip to content

refactor(StaxStreamXMLReader): remove duplicate ifs #35869

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −14
Open

refactor(StaxStreamXMLReader): remove duplicate ifs #35869

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
28 changes: 14 additions & 14 deletions spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.ext.Locator2;
import org.xml.sax.helpers.AttributesImpl;
import org.xml.sax.ext.LexicalHandler;

import org.springframework.util.StringUtils;

Expand Down Expand Up @@ -227,22 +228,21 @@ private void handleComment() throws SAXException {
}

private void handleDtd() throws SAXException {
if (getLexicalHandler() != null) {
Location location = this.reader.getLocation();
getLexicalHandler().startDTD(null, location.getPublicId(), location.getSystemId());
}
if (getLexicalHandler() != null) {
getLexicalHandler().endDTD();
}
LexicalHandler lexical = getLexicalHandler();
if (lexical == null) return;

Location loc = this.reader.getLocation();
lexical.startDTD(null, loc.getPublicId(), loc.getSystemId());
lexical.endDTD();
}

private void handleEntityReference() throws SAXException {
if (getLexicalHandler() != null) {
getLexicalHandler().startEntity(this.reader.getLocalName());
}
if (getLexicalHandler() != null) {
getLexicalHandler().endEntity(this.reader.getLocalName());
}
LexicalHandler lexical = getLexicalHandler();
if (lexical == null) return;

String name = this.reader.getLocalName();
lexical.startEntity(name);
lexical.endEntity(name);
}

private void handleEndDocument() throws SAXException {
Expand Down Expand Up @@ -289,4 +289,4 @@ private Attributes getAttributes() {
return attributes;
}

}
}