From ac16b1fa65f095b7b7b715bf0a713e62300be732 Mon Sep 17 00:00:00 2001 From: lucasward Date: Fri, 2 May 2008 15:54:29 +0000 Subject: [PATCH] BATCH-610:StaxEventItemReader didn't close correctly either, and the test for single column driving query wasn't passing through close calls. --- .../org/springframework/batch/item/xml/StaxEventItemReader.java | 1 + .../org/springframework/batch/item/database/FooInputSource.java | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java index 605f0539e..246dd901a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java @@ -91,6 +91,7 @@ public class StaxEventItemReader extends ExecutionContextUserSupport implements public void close(ExecutionContext executionContext) { initialized = false; + currentRecordCount = 0; try { if (fragmentReader != null) { fragmentReader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java index a73badfb5..188e8a4f3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java @@ -48,6 +48,7 @@ class FooItemReader implements ItemStream, ItemReader, DisposableBean, Initializ }; public void close(ExecutionContext executionContext) { + inputSource.close(executionContext); } /*