From 39210aa3d6c6decdf47a6b10eb947ff002d825bb Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 5 Feb 2008 10:28:18 +0000 Subject: [PATCH] Re-order assertion to catch the problem if it exists earlier --- .../batch/sample/item/reader/StagingItemReader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java index bbad67170..2e87185d5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java @@ -144,12 +144,12 @@ public class StagingItemReader extends JdbcDaoSupport implements ItemStream, Key if (key == null) { synchronized (lock) { if (keys.hasNext()) { + Assert.state(TransactionSynchronizationManager.isActualTransactionActive(), + "Transaction not active for this thread."); Long next = (Long) keys.next(); getBuffer().add(next); key = next; logger.debug("Retrieved key from list: " + key); - Assert.state(TransactionSynchronizationManager.isActualTransactionActive(), - "Transaction not active for this thread."); } } } @@ -218,7 +218,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(ExecutionAttributes executionAttributes) { + public void mark() { getBuffer().commit(); }