From 9a661a2160530ad49c2d4833e583e66a639eeb7d Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 22 Dec 2010 23:24:56 -0500 Subject: [PATCH] name clarity --- .../handler/FileTransferringMessageHandler.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java index d94edab81c..1b8aa424b8 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java @@ -33,7 +33,6 @@ import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; -import org.springframework.util.StringUtils; /** * A {@link org.springframework.integration.core.MessageHandler} implementation that transfers files to a remote server. @@ -55,9 +54,9 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { private volatile File temporaryDirectory = new File(System.getProperty("java.io.tmpdir")); private volatile String charset = "UTF-8"; - + private volatile String remoteFileSeparator = "/"; - + public FileTransferringMessageHandler(SessionFactory sessionFactory) { Assert.notNull(sessionFactory, "sessionFactory must not be null"); @@ -92,9 +91,9 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { if (file != null && file.exists()) { Session session = this.sessionFactory.getSession(); try { - String targetDirectory = this.directoryExpressionProcessor.processMessage(message); + String remoteDirectory = this.directoryExpressionProcessor.processMessage(message); String fileName = this.fileNameGenerator.generateFileName(message); - this.sendFileToRemoteDirectory(file, targetDirectory, fileName, session); + this.sendFileToRemoteDirectory(file, remoteDirectory, fileName, session); } catch (FileNotFoundException e) { throw new MessageDeliveryException(message, @@ -158,7 +157,7 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { } private void sendFileToRemoteDirectory(File file, String remoteDirectory, String fileName, Session session) - throws FileNotFoundException, IOException { + throws FileNotFoundException, IOException { FileInputStream fileInputStream = new FileInputStream(file); if (!remoteDirectory.endsWith(remoteFileSeparator)) {