From f58b33f83c63fbba791db759a008250ca2bc4815 Mon Sep 17 00:00:00 2001 From: dsyer Date: Fri, 25 Jul 2008 10:03:47 +0000 Subject: [PATCH] RESOLVED - issue BATCH-744: restart.count is always 0 in FlatFileItemWriter --- .../springframework/batch/item/file/FlatFileItemWriter.java | 5 ----- .../batch/item/file/FlatFileItemWriterTests.java | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java index a51a09315..93be62415 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java @@ -72,8 +72,6 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement private static final String WRITTEN_STATISTICS_NAME = "written"; - private static final String RESTART_COUNT_STATISTICS_NAME = "restart.count"; - private static final String RESTART_DATA_NAME = "current.count"; private Resource resource; @@ -281,7 +279,6 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement } executionContext.putLong(getKey(WRITTEN_STATISTICS_NAME), state.linesWritten); - executionContext.putLong(getKey(RESTART_COUNT_STATISTICS_NAME), state.restartCount); } } @@ -345,8 +342,6 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement long linesWritten = 0; - long restartCount = 0; - boolean shouldDeleteIfExists = true; boolean initialized = false; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java index 623f2cd07..b113e13e0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java @@ -223,6 +223,7 @@ public class FlatFileItemWriterTests extends TestCase { public void testRestart() throws Exception { writer.open(executionContext); + // write some lines writer.write("testLine1"); writer.write("testLine2"); @@ -251,7 +252,7 @@ public class FlatFileItemWriterTests extends TestCase { // init with correct data writer.open(executionContext); - + // write more lines writer.write("testLine6"); writer.write("testLine7"); @@ -312,7 +313,7 @@ public class FlatFileItemWriterTests extends TestCase { writer.open(executionContext); writer.update(executionContext); assertNotNull(executionContext); - assertEquals(3, executionContext.entrySet().size()); + assertEquals(2, executionContext.entrySet().size()); assertEquals(0, executionContext.getLong(ClassUtils.getShortName(FlatFileItemWriter.class) + ".current.count")); }