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.

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

8240256: Better resource cleaning for SunPKCS11 Provider #352

Closed
wants to merge 1 commit into from

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Sep 15, 2021

Backport of JDK-8240256. Actual fix applies cleanly, but tests need resolution:

  • PKCS11Test.java: Needed to integrate manually. Can't remove imports because they are still needed in 11u.
  • MultipleLogins.java: !Reference.refersTo(null) is not available in 11. Replaced by Reference.get() != null
  • ForceGC.java is needed. Copied from jdk/head.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8240256: Better resource cleaning for SunPKCS11 Provider

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/352/head:pull/352
$ git checkout pull/352

Update a local copy of the PR:
$ git checkout pull/352
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/352/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 352

View PR using the GUI difftool:
$ git pr show -t 352

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/352.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 15, 2021

👋 Welcome back mdoerr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport bdeaeb47d0155b9f233274cff90334e8dd761aae 8240256: Better resource cleaning for SunPKCS11 Provider Sep 15, 2021
@openjdk
Copy link

openjdk bot commented Sep 15, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Sep 15, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 15, 2021

Webrevs

Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

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

LGTM
Precise change description :)

@openjdk
Copy link

openjdk bot commented Sep 16, 2021

@TheRealMDoerr This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8240256: Better resource cleaning for SunPKCS11 Provider

Reviewed-by: goetz

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 2 new commits pushed to the master branch:

  • 777039b: 8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems)
  • e3f923f: 8273795: Zero SPARC64 debug builds fail due to missing interpreter fields

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 16, 2021
@TheRealMDoerr
Copy link
Contributor Author

Thanks for the review and the approval!
/integrate

@openjdk
Copy link

openjdk bot commented Sep 17, 2021

Going to push as commit e34f047.
Since your change was applied there have been 4 commits pushed to the master branch:

  • 3bddee5: 8210392: assert(Compile::current()->live_nodes() < Compile::current()->max_node_limit()) failed: Live Node limit exceeded limit
  • 54a9e3c: 8236177: assert(status == 0) failed: error ETIMEDOUT(60), cond_wait
  • 777039b: 8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems)
  • e3f923f: 8273795: Zero SPARC64 debug builds fail due to missing interpreter fields

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 17, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 17, 2021
@openjdk
Copy link

openjdk bot commented Sep 17, 2021

@TheRealMDoerr Pushed as commit e34f047.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@TheRealMDoerr TheRealMDoerr deleted the 8240256_PKCS11 branch September 17, 2021 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants