Skip to content
This repository has been archived by the owner. It is now read-only.

8279222: Incorrect legacyMap.get in java.security.Provider after JDK-8276660 #70

Closed
wants to merge 6 commits into from

Conversation

shipilev
Copy link
Contributor

@shipilev shipilev commented Dec 23, 2021

SonarCloud reports:
A "Map<ServiceKey, Service>" cannot contain a "String" in a "ServiceKey" type.

     // clean up old alias if present
     Service prevAliasService = legacyMap.get(aliasAlg);

Should be aliasKey, like other accesses to legacyMap. This code is introduced by JDK-8276660, so it affects JDK 18.

Additional testing:

  • Linux x86_64 fastdebug jdk_security

Progress

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

Issue

  • JDK-8279222: Incorrect legacyMap.get in java.security.Provider after JDK-8276660

Reviewers

Contributors

  • Valerie Peng <valeriep@openjdk.org>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk18 pull/70/head:pull/70
$ git checkout pull/70

Update a local copy of the PR:
$ git checkout pull/70
$ git pull https://git.openjdk.java.net/jdk18 pull/70/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 70

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk18/pull/70.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 23, 2021

👋 Welcome back shade! 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 added the rfr label Dec 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 23, 2021

@shipilev The following label will be automatically applied to this pull request:

  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the security label Dec 23, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 23, 2021

Webrevs

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jan 4, 2022

/contributor add @valeriepeng

@openjdk
Copy link

@openjdk openjdk bot commented Jan 4, 2022

@shipilev
Contributor Valerie Peng <valeriep@openjdk.org> successfully added.

Copy link

@AlanBateman AlanBateman left a comment

Thanks for coordinating on this to ensure the change has a test.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 4, 2022

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8279222: Incorrect legacyMap.get in java.security.Provider after JDK-8276660

Co-authored-by: Valerie Peng <valeriep@openjdk.org>
Reviewed-by: alanb, valeriep

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

  • 95a3010: 8275830: C2: Receiver downcast is missing when inlining through method handle linkers
  • 58b5fb3: 8265317: [vector] assert(payload->is_object()) failed: expected 'object' value for scalar-replaced boxed vector but got: NULL
  • 06f3713: 8279379: GHA: Print tests that are in error
  • e7244c1: 8278966: two microbenchmarks tests fail "assert(!jvms->method()->has_exception_handlers()) failed: no exception handler expected" after JDK-8275638

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 label Jan 4, 2022
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Jan 5, 2022

Thanks for reviews!

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jan 5, 2022

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

  • f8f9148: 8278948: compiler/vectorapi/reshape/TestVectorCastAVX1.java crashes in assembler
  • 95a3010: 8275830: C2: Receiver downcast is missing when inlining through method handle linkers
  • 58b5fb3: 8265317: [vector] assert(payload->is_object()) failed: expected 'object' value for scalar-replaced boxed vector but got: NULL
  • 06f3713: 8279379: GHA: Print tests that are in error
  • e7244c1: 8278966: two microbenchmarks tests fail "assert(!jvms->method()->has_exception_handlers()) failed: no exception handler expected" after JDK-8275638

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 5, 2022
@openjdk openjdk bot closed this Jan 5, 2022
@openjdk openjdk bot removed ready rfr labels Jan 5, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 5, 2022

@shipilev Pushed as commit 0f4807e.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
integrated security
3 participants