Skip to content

Reinstate inadvertently removed protected method in StaxEventItemWriter #5261

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
banseok1216 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

Reinstate inadvertently removed protected method in StaxEventItemWriter #5261

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
14 changes: 12 additions & 2 deletions .../src/main/java/org/springframework/batch/infrastructure/item/xml/StaxEventItemWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ public void close(@Nullable StaxWriterCallback footerCallback, List<QName> unclo
footerCallback.write(footerCallbackWriter);
}
delegateEventWriter.flush();
endDocument();
endDocument(delegateEventWriter);
}
catch (IOException e) {
throw new ItemStreamException("Failed to write footer items", e);
Expand Down Expand Up @@ -893,7 +893,7 @@ private void closeStream() {
* @throws XMLStreamException thrown if error occurs.
*/
@SuppressWarnings("DataFlowIssue")
private void endDocument() throws XMLStreamException {
private void writeEndRootElement() throws XMLStreamException {

// writer.writeEndDocument(); <- this doesn't work after restart
// we need to write end tag of the root element manually
Expand Down Expand Up @@ -925,4 +925,14 @@ private void setPosition(long newPosition) {

}

/**
* Writes the EndDocument tag manually.
* @param writer XML event writer
* @throws XMLStreamException thrown if error occurs.
*/
protected void endDocument(XMLEventWriter writer) throws XMLStreamException {
Assert.state(this.state != null, "OutputState is not initialized");
this.state.writeEndRootElement();
}

}