From d0927bf42d9ed72a585bdfc0c893737b96a2540b Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 19 Nov 2010 16:03:05 -0500 Subject: [PATCH] INT-1614 returning boolean if retrieved inputStream is null --- .../ftp/inbound/FtpInboundFileSynchronizer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java index fb0d77a572..3757618b0a 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java @@ -96,12 +96,13 @@ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer< if (!localFile.exists()) { String tempFileName = localFileName + AbstractInboundFileSynchronizingMessageSource.INCOMPLETE_EXTENSION; File file = new File(tempFileName); - FileOutputStream fos = new FileOutputStream(file); + FileOutputStream fileOutputStream = new FileOutputStream(file); try { - InputStream i = client.retrieveFileStream(remoteFileName); - if (i != null){ - FileCopyUtils.copy(i, fos); + InputStream inputStream = client.retrieveFileStream(remoteFileName); + if (inputStream == null) { + return false; } + FileCopyUtils.copy(inputStream, fileOutputStream); acknowledge(client, ftpFile); } catch (Exception e) { @@ -113,7 +114,7 @@ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer< } } finally { - fos.close(); + fileOutputStream.close(); } file.renameTo(localFile); return true;