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

RemoteFileTemplate: Fix Checkstyle violation

Browse Source 
* Add `if (session != null)` in the `RemoteFileTemplate` around `dirty()`

(cherry picked from commit 1d5e66b0ee)
This commit is contained in:
Artem Bilan
2019-01-10 11:05:18 -05:00
parent f63abc161a
commit 565578b392
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java
View File

@@ -35,7 +35,6 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.expression.Expression;
import org.springframework.integration.file.DefaultFileNameGenerator;
import org.springframework.integration.file.FileNameGenerator;
import org.springframework.integration.file.remote.session.CachingSessionFactory;
import org.springframework.integration.file.remote.session.Session;
import org.springframework.integration.file.remote.session.SessionFactory;
import org.springframework.integration.file.support.FileExistsMode;
@@ -444,14 +443,16 @@ public class RemoteFileTemplate<F> implements RemoteFileOperations<F>, Initializ
return callback.doInSession(session);
}
catch (Exception e) {
session.dirty();
if (session != null) {
session.dirty();
}
if (e instanceof MessagingException) {
throw (MessagingException) e;
}
throw new MessagingException("Failed to execute on session", e);
}
finally {
if (!invokeScope) {
if (!invokeScope && session != null) {
try {
session.close();
}