From 565578b3923cbc7cf7c507a897903773efdcb357 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 10 Jan 2019 11:05:18 -0500 Subject: [PATCH] RemoteFileTemplate: Fix Checkstyle violation * Add `if (session != null)` in the `RemoteFileTemplate` around `dirty()` (cherry picked from commit 1d5e66b0eedd9b2374b3fc1f3e9dcca0cddb3f56) --- .../integration/file/remote/RemoteFileTemplate.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java index 64c0c7a7ed..9cb0e2cedd 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileTemplate.java @@ -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 implements RemoteFileOperations, 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(); }