Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Jun 23, 2021

SonarCloud reports:
"Remove or correct this useless self-assignment."

        if (cipherAlgo.equals("AES")) {
            this.keysize = keysize; // <---- here
            switch (keysize) {
            case 128:
                cipherAlgo_OID = aes128CBC_OID;

Seems to be here since initial addition in JDK-6383200.

Additional testing:

  • jdk_security pass

Progress

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

Issue

  • JDK-8269216: Useless initialization in com/sun/crypto/provider/PBES2Parameters.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4570

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 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 Pull request is ready for review label Jun 23, 2021
@openjdk
Copy link

openjdk bot commented Jun 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 security-dev@openjdk.org label Jun 23, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 23, 2021

Webrevs

Copy link
Contributor

@valeriepeng valeriepeng left a comment

Choose a reason for hiding this comment

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

Changes look good. I also added the noreg-cleanup label to the bug record.

@openjdk
Copy link

openjdk bot commented Jun 23, 2021

@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:

8269216: Useless initialization in com/sun/crypto/provider/PBES2Parameters.java

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

  • 7621fa3: 8268464: Remove dependancy of TestHttpsServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/https/ tests
  • f3ba269: 8256306: ObjectMonitor::_contentions field should not be 'jint'
  • 52d5d1b: 8269188: [BACKOUT] Remove CodeCache::mark_for_evol_deoptimization() method
  • f2e690e: 8268720: Unspecified checks on NameAndType constants should not be performed
  • 2c29d79: 8269206: A small typo in comment in test/lib/sun/hotspot/WhiteBox.java
  • 6237630: 8269120: Build failure with GCC 6.3.0 after JDK-8017163
  • a5e4307: 8269134: Remove sparsePRT.inline.hpp after JDK-8017163
  • 17daf32: 8269138: Move typeArrayOop.inline.hpp include to vectorSupport.cpp
  • 36d82b6: 8268858: Determine register pressure automatically by the number of available registers for allocation
  • ae3eedc: 8268727: Remove unused slowpath locking method in OptoRuntime
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/2e639dd34a4342de6e1b9470448d66ef89c4bd52...master

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 Jun 23, 2021
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 24, 2021

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

  • 51d9159: 8236212: CompiledMethodLoad and CompiledMethodUnload events can be posted in START phase
  • 280f2d5: 8268433: serviceability/dcmd/framework/VMVersionTest.java fails with Unable to send object throw not established PipeIO Listener Thread connection
  • f375916: 8269186: [REDO] Remove CodeCache::mark_for_evol_deoptimization() method
  • 7621fa3: 8268464: Remove dependancy of TestHttpsServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/https/ tests
  • f3ba269: 8256306: ObjectMonitor::_contentions field should not be 'jint'
  • 52d5d1b: 8269188: [BACKOUT] Remove CodeCache::mark_for_evol_deoptimization() method
  • f2e690e: 8268720: Unspecified checks on NameAndType constants should not be performed
  • 2c29d79: 8269206: A small typo in comment in test/lib/sun/hotspot/WhiteBox.java
  • 6237630: 8269120: Build failure with GCC 6.3.0 after JDK-8017163
  • a5e4307: 8269134: Remove sparsePRT.inline.hpp after JDK-8017163
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/2e639dd34a4342de6e1b9470448d66ef89c4bd52...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 24, 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 Jun 24, 2021
@openjdk
Copy link

openjdk bot commented Jun 24, 2021

@shipilev Pushed as commit e515873.

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

@shipilev shipilev deleted the JDK-8269216-useless-init branch July 2, 2021 09:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated security security-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

2 participants