Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - BATCH-761: StaxEventItemWriter writes extra end document tag with Woodstox 3.2.6

Browse Source 
made endDocument(..) protected
This commit is contained in:
robokaso
2008-08-11 08:52:03 +00:00
parent d4d35cd668
commit 206e7521dd
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java
View File

@@ -16,6 +16,8 @@ import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.item.ClearFailedException;
import org.springframework.batch.item.ExecutionContext;
import org.springframework.batch.item.FlushFailedException;
@@ -50,6 +52,8 @@ import org.springframework.util.CollectionUtils;
public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implements ItemWriter<T>, ItemStream,
InitializingBean {
private static final Log log = LogFactory.getLog(StaxEventItemWriter.class);
// default encoding
private static final String DEFAULT_ENCODING = "UTF-8";
@@ -338,23 +342,16 @@ public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implemen
}
/**
* Finishes the XML document. It closes any start tag and writes
* corresponding end tags.
* Writes the EndDocument tag manually.
*
* @param writer XML event writer
* @throws XMLStreamException
*/
private void endDocument(XMLEventWriter writer) throws XMLStreamException {
protected void endDocument(XMLEventWriter writer) throws XMLStreamException {
// writer.writeEndDocument(); <- this doesn't work after restart
// we need to write end tag of the root element manually
// harmless event to close the root tag if there were no items
XMLEventFactory factory = XMLEventFactory.newInstance();
writer.add(factory.createCharacters(""));
writer.flush();
ByteBuffer bbuf = ByteBuffer.wrap(("</" + getRootTagName() + ">").getBytes());
try {
channel.write(bbuf);
@@ -370,6 +367,16 @@ public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implemen
* @see org.springframework.batch.item.ItemStream#close(ExecutionContext)
*/
public void close(ExecutionContext executionContext) {
// harmless event to close the root tag if there were no items
XMLEventFactory factory = XMLEventFactory.newInstance();
try {
delegateEventWriter.add(factory.createCharacters(""));
}
catch (XMLStreamException e) {
log.error(e);
}
flush();
try {
endDocument(delegateEventWriter);