From 015b7e59ebca09630f4850f00978dae5f972eb18 Mon Sep 17 00:00:00 2001 From: dsyer Date: Thu, 18 Jun 2009 07:16:35 +0000 Subject: [PATCH] RESOLVED - issue BATCH-1297: Add null check for FlatFileItemReader in case resource exists on close, but not on open(!) http://jira.springframework.org/browse/BATCH-1297 --- .../org/springframework/batch/item/file/FlatFileItemReader.java | 2 +- .../batch/item/file/FlatFileItemReaderTests.java | 2 +- 2 files changed, 2 insertions(+), 2 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 2e1dcefcc..f8208d72b 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 @@ -229,7 +229,7 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea @Override protected void doClose() throws Exception { lineCount = 0; - if (resource.exists()) { + if (reader!=null) { reader.close(); } } 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 55ce5b541..2011f1bae 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 @@ -167,7 +167,7 @@ public class FlatFileItemReaderTests { } public String getDescription() { - return "NonExistantResource"; + return "NonExistentResource"; } public InputStream getInputStream() throws IOException {