Skip to content
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

Improve error handling in InputStream.close() for SFTP channels #331

Merged
merged 1 commit into from
May 25, 2023
Merged

Improve error handling in InputStream.close() for SFTP channels #331

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
4 changes: 3 additions & 1 deletion src/main/java/com/jcraft/jsch/ChannelSftp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,8 +1495,10 @@ public void close() throws IOException {
rq.cancel(header, buf);
try {
_sendCLOSE(handle, header);
} catch (IOException e) {
throw e;
} catch (Exception e) {
throw new IOException("error");
throw new IOException(e.toString(), e);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest doing it like this instead:

if (e instanceof IOException)
  throw (IOException) e;
throw new IOException(e.toString(), e);

Copy link
Contributor Author

@stsiano stsiano May 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied this particular code block from another part of the same file (line 826).

Sonar proposes to do this the way I did this
https://rules.sonarsource.com/java/RSPEC-1193

In the end the code is equivalent, so if you care about it, I can also change the pull request.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I see that now, apologies.

}
}
};
Expand Down