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.
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
8273553: sun.security.ssl.SSLEngineImpl.closeInbound also has similar error of JDK-8253368 #1422
Conversation
👋 Welcome back goetz! 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. |
Webrevs
|
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 okay to me, but have you considered to change
src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
in a way more close to jdk17 ?
public void closeInbound() throws SSLException {
try {
...
} finally {
conContext.closeInbound();
}
?
You are right. In JDK-8253368, a try was added, too. |
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.
Why not move up the try a bit (for easier backporting from jdk in future), please compare
https://github.com/openjdk/jdk17u-dev/blob/master/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java#L778
https://github.com/openjdk/jdk/blob/master/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java#L778
(otherwise okay)
@GoeLin 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 49 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Hi, |
@martinuy, I would appreciate if you also could have a look on this! |
/reviewers 2 reviewer |
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.
Thanks @GoeLin for proposing this backport. Looks good to me.
I think that calling conContext.closeInbound
as part of the finally block is right. I also prefer that refactorings related to fibers are done separately -if it's ever decided to backport them, which I doubt.
One very minor detail (optional): there is an extra space in "throw new SSLException". The only reason I might fix this is to grep text easier. I'd also indent the line below 8 spaces.
Hi @martinuy, thanks for looking at this! |
/integrate |
Going to push as commit 243a55e.
Your commit was automatically rebased without conflicts. |
I backport this for parity with 11.0.18-oracle.
I had to resolve closeInbound() in SSLEngineImpl.java because
"8221882: Use fiber-friendly java.util.concurrent.locks in JSSE"
is not in 11.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1422/head:pull/1422
$ git checkout pull/1422
Update a local copy of the PR:
$ git checkout pull/1422
$ git pull https://git.openjdk.org/jdk11u-dev pull/1422/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1422
View PR using the GUI difftool:
$ git pr show -t 1422
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1422.diff