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

polishing, cleaned up SftpSession rename() method

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-05-06 14:37:03 -04:00
parent 4e7f5530b3
commit e350874842
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java
View File

@@ -140,25 +140,31 @@ class SftpSession implements Session {
try {
this.channel.rename(pathFrom, pathTo);
}
catch (SftpException e) {
try {
logger.debug("Initial File rename failed, possibly becouse file already exists. Will attempt to delete file: "
catch (SftpException sftpex) {
if (logger.isDebugEnabled()){
logger.debug("Initial File rename failed, possibly because file already exists. Will attempt to delete file: "
+ pathTo + " and execute rename again.");
}
try {
this.remove(pathTo);
logger.debug("Delete file: " + pathTo + " succeeded");
if (logger.isDebugEnabled()){
logger.debug("Delete file: " + pathTo + " succeeded. Will attempt rename again");
}
}
catch (Exception ex) {
// ignore since the exception might be thrown
catch (IOException ioex) {
throw new NestedIOException("Failed to delete file " + pathTo, ioex);
}
try {
// attempt to rename again
this.channel.rename(pathFrom, pathTo);
}
catch (Exception e2) {
throw new NestedIOException("failed to rename from " + pathFrom + " to " + pathTo, e);
catch (SftpException sftpex2) {
throw new NestedIOException("failed to rename from " + pathFrom + " to " + pathTo, sftpex2);
}
}
logger.debug("File: " + pathFrom + " was successfully renamed to " + pathTo);
if (logger.isDebugEnabled()){
logger.debug("File: " + pathFrom + " was successfully renamed to " + pathTo);
}
}
public void mkdir(String directory) throws IOException {