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

RESOLVED - BATCH-969: FlatFileItemWriters interference in CompositeItemWriter

Browse Source 
configurable transactional buffer name in TransactionAwareBufferedWriter
sample showing correct usage of two file writers simultaneously
This commit is contained in:
robokaso
2008-12-15 10:19:36 +00:00
parent 48517b2b93
commit 85f815b094
7 changed files with 99 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java
View File

@@ -450,7 +450,7 @@ public class FlatFileItemWriter<T> extends ExecutionContextUserSupport implement
private Writer getBufferedWriter(FileChannel fileChannel, String encoding) {
try {
TransactionAwareBufferedWriter outputBufferedWriter = new TransactionAwareBufferedWriter(Channels
.newWriter(fileChannel, encoding));
.newWriter(fileChannel, encoding), getName());
return outputBufferedWriter;
}
catch (UnsupportedCharsetException ucse) {

8
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/util/ExecutionContextUserSupport.java
View File

@@ -29,6 +29,14 @@ public class ExecutionContextUserSupport {
private String name;
/**
* @return name used to uniquely identify this instance's entries in shared
* context.
*/
protected String getName() {
return this.name;
}
/**
* @param name unique name for the item stream used to create execution
* context keys.

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

@@ -300,7 +300,7 @@ public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implemen
try {
delegateEventWriter = outputFactory.createXMLEventWriter(new TransactionAwareBufferedWriter(
new OutputStreamWriter(os, encoding)));
new OutputStreamWriter(os, encoding), getName()));
eventWriter = new NoStartEndDocumentStreamWriter(delegateEventWriter);
if (!restarted) {
startDocument(delegateEventWriter);

39
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriter.java
View File

@@ -33,16 +33,21 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
*/
public class TransactionAwareBufferedWriter extends Writer {
private static final String BUFFER_KEY = TransactionAwareBufferedWriter.class.getName() + ".BUFFER_KEY";
private static final String BUFFER_KEY_PREFIX = TransactionAwareBufferedWriter.class.getName() + ".BUFFER_KEY";
private String bufferKey;
private Writer writer;
/**
* @param writer
* @param writer actually writes to output
* @param name used to identify the transactional buffer used by this
* instance
*/
public TransactionAwareBufferedWriter(Writer writer) {
public TransactionAwareBufferedWriter(Writer writer, String name) {
super();
this.writer = writer;
this.bufferKey = BUFFER_KEY_PREFIX + "." + name;
}
/**
@@ -50,14 +55,14 @@ public class TransactionAwareBufferedWriter extends Writer {
*/
private StringBuffer getCurrentBuffer() {
if (!TransactionSynchronizationManager.hasResource(BUFFER_KEY)) {
if (!TransactionSynchronizationManager.hasResource(bufferKey)) {
TransactionSynchronizationManager.bindResource(BUFFER_KEY, new StringBuffer());
TransactionSynchronizationManager.bindResource(bufferKey, new StringBuffer());
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
@Override
public void afterCompletion(int status) {
StringBuffer buffer = (StringBuffer) TransactionSynchronizationManager.getResource(BUFFER_KEY);
StringBuffer buffer = (StringBuffer) TransactionSynchronizationManager.getResource(bufferKey);
if (status == STATUS_COMMITTED) {
try {
writer.write(buffer.toString());
@@ -67,14 +72,14 @@ public class TransactionAwareBufferedWriter extends Writer {
throw new FlushFailedException("Could not write to output buffer", e);
}
}
TransactionSynchronizationManager.unbindResource(BUFFER_KEY);
TransactionSynchronizationManager.unbindResource(bufferKey);
}
});
}
return (StringBuffer) TransactionSynchronizationManager.getResource(BUFFER_KEY);
return (StringBuffer) TransactionSynchronizationManager.getResource(bufferKey);
}
/**
@@ -84,7 +89,9 @@ public class TransactionAwareBufferedWriter extends Writer {
return TransactionSynchronizationManager.isActualTransactionActive();
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see java.io.Writer#close()
*/
@Override
@@ -92,7 +99,9 @@ public class TransactionAwareBufferedWriter extends Writer {
writer.close();
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see java.io.Writer#flush()
*/
@Override
@@ -102,7 +111,9 @@ public class TransactionAwareBufferedWriter extends Writer {
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see java.io.Writer#write(char[], int, int)
*/
@Override
@@ -115,7 +126,7 @@ public class TransactionAwareBufferedWriter extends Writer {
StringBuffer buffer = getCurrentBuffer();
buffer.append(cbuf, off, len);
}
}