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

GH-8563: Fix SFTP RENAME with unconditional DEL (#8671)

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/8563

* Rework the `SftpSession.rename()` logic to be similar to what is there in the `FtpSession`, for example:
try to remove a remote target file before renaming.
* Fix `SftpSession.remove()` to check for `SftpConstants.SSH_FX_NO_SUCH_FILE` response status
to return `false`
This commit is contained in:
Artem Bilan
2023-07-12 10:57:03 -04:00
committed by GitHub
parent c5f6c126e8
commit 9597b7addb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -65,7 +65,18 @@ public class SftpSession implements Session<SftpClient.DirEntry> {
@Override
public boolean remove(String path) throws IOException {
this.sftpClient.remove(path);
try {
this.sftpClient.remove(path);
}
catch (SftpException sftpEx) {
if (SftpConstants.SSH_FX_NO_SUCH_FILE == sftpEx.getStatus()) {
return false;
}
else {
throw sftpEx;
}
}
return true;
}
@@ -174,19 +185,8 @@ public class SftpSession implements Session<SftpClient.DirEntry> {
this.sftpClient.rename(pathFrom, pathTo, SftpClient.CopyMode.Overwrite);
}
else {
try {
this.sftpClient.rename(pathFrom, pathTo);
}
catch (SftpException sftpex) {
if (SftpConstants.SSH_FX_FILE_ALREADY_EXISTS == sftpex.getStatus()) {
remove(pathTo);
// attempt to rename again
this.sftpClient.rename(pathFrom, pathTo);
}
else {
throw sftpex;
}
}
remove(pathTo);
this.sftpClient.rename(pathFrom, pathTo);
}
}