Skip to content

(chores) camel-ftp: prevent disconnect from suppressing exception #9029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orpiske merged 1 commit into from
Jan 10, 2023
Merged

(chores) camel-ftp: prevent disconnect from suppressing exception #9029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,17 +302,21 @@ protected void doDisconnect() throws GenericFileOperationFailedException {
try {
log.trace("Client logout");
client.logout();
client.disconnect();
} catch (IOException e) {
throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
} finally {
GenericFileOperationFailedException gfo = new GenericFileOperationFailedException(
client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
try {
log.trace("Client disconnect");
client.disconnect();
} catch (IOException e) {
throw new GenericFileOperationFailedException(
client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
} catch (IOException ed) {
log.warn("Failed to disconnect: {}", e.getMessage(), e);
gfo.addSuppressed(ed);
}

throw gfo;
}

clientActivityListener.onDisconnected(endpoint.getConfiguration().remoteServerInformation());
}

Expand Down