-
Notifications
You must be signed in to change notification settings - Fork 28
8274524: SSLSocket.close() hangs if it is called during the ssl handshake #326
Conversation
|
👋 Welcome back abakhtin! A progress list of the required criteria for merging this PR into |
|
This backport pull request has now been updated with issue from the original commit. |
|
@alexeybakhtin This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 1 new commit pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@XueleiFan) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
Webrevs
|
XueleiFan
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me except a mini coding style comment.
| if (soTimeout == 0) | ||
| setSoTimeout(DEFAULT_SKIP_TIMEOUT); | ||
| ((SSLSocketInputRecord) (conContext.inputRecord)).deplete(false); | ||
| } catch (java.net.SocketTimeoutException stEx) { | ||
| // skip timeout exception during deplete | ||
| } finally { | ||
| if (soTimeout == 0) | ||
| setSoTimeout(soTimeout); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Braces should be used for the if-clauses.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you. Braces are added
|
/integrate |
|
@alexeybakhtin |
|
/sponsor |
|
@yan-too @alexeybakhtin Pushed as commit d7b8c97. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Backport of JDK-8274524 to JDK13u-dev
Backport is almost clean except for trivial fix for Pattern Matching in the instanceof (not available in JDK13)
sun/security/ssl/SSLSocketImpl tests passed
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/326/head:pull/326$ git checkout pull/326Update a local copy of the PR:
$ git checkout pull/326$ git pull https://git.openjdk.java.net/jdk13u-dev pull/326/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 326View PR using the GUI difftool:
$ git pr show -t 326Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk13u-dev/pull/326.diff