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

INT-1614 fixed issue with FTP retrieve stream

Browse Source
This commit is contained in:
Mark Fisher
2010-11-19 20:02:55 -05:00
parent fc9fff58d4
commit 0a6842dd7d
5 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java
View File

@@ -25,7 +25,6 @@ import java.util.Collection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.springframework.core.io.Resource;
@@ -105,7 +104,6 @@ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer<
File file = new File(tempFileName);
FileOutputStream fileOutputStream = new FileOutputStream(file);
try {
//InputStream inputStream = client.retrieveFileStream(remoteFileName);
InputStream inputStream = session.get(remoteFileName);
if (inputStream == null) {
return false;
@@ -138,11 +136,10 @@ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer<
private final Log logger = LogFactory.getLog(this.getClass());
public void acknowledge(Object useful, FTPFile fptFile) throws Exception {
FTPClient ftpClient = (FTPClient) useful;
if ((fptFile != null) && ftpClient.deleteFile(fptFile.getName())) {
public void acknowledge(Session session, FTPFile ftpFile) throws Exception {
if ((ftpFile != null) && session.rm(ftpFile.getName())) {
if (logger.isDebugEnabled()) {
logger.debug("deleted " + fptFile.getName());
logger.debug("deleted " + ftpFile.getName());
}
}
}

2
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
View File

@@ -48,7 +48,7 @@ import org.springframework.util.FileCopyUtils;
* @author Josh Long
* @author Oleg Zhurakousky
*/
public class FtpSendingMessageHandler extends AbstractMessageHandler{
public class FtpSendingMessageHandler extends AbstractMessageHandler {
private static final String TEMPORARY_FILE_SUFFIX = ".writing";

4
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpSession.java
View File

@@ -82,7 +82,9 @@ public class FtpSession implements Session {
public InputStream get(String source) {
try {
return this.client.retrieveFileStream(source);
InputStream inputStream = this.client.retrieveFileStream(source);
this.client.completePendingCommand();
return inputStream;
}
catch (IOException e) {
if (logger.isWarnEnabled()) {