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

RESOLVED - issue BATCH-343: close() is called twice on ItemReaders/ItemWriters

Browse Source 
http://jira.springframework.org/browse/BATCH-343

ItemStream implementations no longer implement DisposableBean
This commit is contained in:
robokaso
2008-02-06 14:20:21 +00:00
parent 242970dd29
commit 37cf297899
14 changed files with 195 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java
View File

@@ -11,11 +11,10 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.execution.scope.StepContext;
import org.springframework.batch.execution.scope.StepContextAware;
import org.springframework.batch.item.ExecutionAttributes;
import org.springframework.batch.item.ItemStream;
import org.springframework.batch.item.KeyedItemReader;
import org.springframework.batch.item.ExecutionAttributes;
import org.springframework.batch.sample.item.writer.StagingItemWriter;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.dao.OptimisticLockingFailureException;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.support.JdbcDaoSupport;
@@ -24,8 +23,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.Assert;
public class StagingItemReader extends JdbcDaoSupport implements ItemStream, KeyedItemReader, DisposableBean,
StepContextAware {
public class StagingItemReader extends JdbcDaoSupport implements ItemStream, KeyedItemReader, StepContextAware {
// Key for buffer in transaction synchronization manager
private static final String BUFFER_KEY = StagingItemReader.class.getName() + ".BUFFER";
@@ -54,14 +52,6 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Key
}
}
/**
* @throws Exception
* @see org.springframework.batch.io.driving.DrivingQueryItemReader#destroy()
*/
public void destroy() throws Exception {
close();
}
/**
*
* @see org.springframework.batch.io.driving.DrivingQueryItemReader#open()
@@ -220,6 +210,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Key
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.ItemStream#mark(org.springframework.batch.item.ExecutionAttributes)
*/
public void mark() {
@@ -228,6 +219,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Key
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.ItemStream#reset(org.springframework.batch.item.ExecutionAttributes)
*/
public void reset() {
@@ -236,6 +228,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Key
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.ItemStream#restoreFrom(org.springframework.batch.item.ExecutionAttributes)
*/
public void restoreFrom(ExecutionAttributes context) {
@@ -244,6 +237,7 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Key
/*
* (non-Javadoc)
*
* @see org.springframework.batch.item.ExecutionAttributesProvider#getExecutionAttributes()
*/
public ExecutionAttributes getExecutionAttributes() {