Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-4430: FileSplitter close reader on exception

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4430

When Iterator-based `FileSplitter` splits the file, and an exception 
throws in downstream flow (in the same thread), the exception propagates 
to the caller leaving underlying file reader opened.

This commit changes `AbstractMessageSplitter` the way, that, 
when any exception happens, if Iterator implements `java.io.Closeable`, 
its `close()` method will be called before propagating exception.

Also `FileSplitter`'s underlying iterator implements `Closeable` now.

* Make `CloseableIterator` to follow `Closeable` contract.

Now `CloseableIterator.close()` declares `IOException` and can be used 
as base interface for `FunctionIterator`.

* Adjust tests.

Adjust tests to reflect the fact that we call `close()` on the reader 
one more time in the end of iterator.

**Cherry-pick to 5.0.x and 4.3.x**
This commit is contained in:
Ruslan Stelmachenko
2018-03-16 16:26:41 +02:00
committed by Artem Bilan
parent f77fd78fb3
commit 7f25cba262
6 changed files with 101 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2017 the original author or authors.
* Copyright 2015-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@ import org.springframework.integration.splitter.AbstractMessageSplitter;
import org.springframework.integration.support.AbstractIntegrationMessageBuilder;
import org.springframework.integration.support.json.JsonObjectMapper;
import org.springframework.integration.support.json.JsonObjectMapperProvider;
import org.springframework.integration.util.CloseableIterator;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.util.Assert;
@@ -68,6 +69,7 @@ import org.springframework.util.StringUtils;
*
* @author Artem Bilan
* @author Gary Russell
* @author Ruslan Stelmachenko
*
* @since 4.1.2
*/
@@ -243,7 +245,7 @@ public class FileSplitter extends AbstractMessageSplitter {
firstLineAsHeader = null;
}
Iterator<Object> iterator = new Iterator<Object>() {
Iterator<Object> iterator = new CloseableIterator<Object>() {
boolean markers = FileSplitter.this.markers;
@@ -263,7 +265,7 @@ public class FileSplitter extends AbstractMessageSplitter {
public boolean hasNext() {
this.hasNextCalled = true;
try {
if (this.line == null && !this.done) {
if (!this.done && this.line == null) {
this.line = bufferedReader.readLine();
}
boolean ready = !this.done && this.line != null;
@@ -280,8 +282,8 @@ public class FileSplitter extends AbstractMessageSplitter {
}
catch (IOException e) {
try {
bufferedReader.close();
this.done = true;
bufferedReader.close();
}
catch (IOException e1) {
// ignored
@@ -344,6 +346,17 @@ public class FileSplitter extends AbstractMessageSplitter {
.setHeader(FileHeaders.MARKER, fileMarker.mark.name());
}
@Override
public void close() {
try {
this.done = true;
bufferedReader.close();
}
catch (IOException e) {
// ignored
}
}
};
if (this.iterator) {