From b19b90be73a0f45e9a72ef60c53d631f206962c3 Mon Sep 17 00:00:00 2001 From: dhgarrette Date: Mon, 16 Feb 2009 22:03:32 +0000 Subject: [PATCH] BATCH-1082: FlatFileItemReader.doClose() checks if the resource exists before trying to close it. --- .../springframework/batch/item/file/FlatFileItemReader.java | 6 ++++-- .../batch/item/file/FlatFileItemReaderTests.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java index fcabddfb4..d7ebf43ad 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java @@ -211,8 +211,10 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea @Override protected void doClose() throws Exception { lineCount = 0; - reader.close(); - + if(resource.exists()) + { + reader.close(); + } } @Override diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java index 31d98dea0..590abb653 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java @@ -115,7 +115,7 @@ public class FlatFileItemReaderTests { reader.open(executionContext); assertNull(reader.read()); - + reader.close(); } @Test