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

8235448: code cleanup in SSLContextImpl.java #1781

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Feb 28, 2023

I backport this as preparation for 8190492.

I had to resolve, because in 11 FIPS support is still implemented. But it's trivial cut&paste.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1781/head:pull/1781
$ git checkout pull/1781

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1781

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1781.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 28, 2023

👋 Welcome back goetz! 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 baebce3d2f996cf2731be8c5d387e709f1213d30 8235448: code cleanup in SSLContextImpl.java Feb 28, 2023
@openjdk
Copy link

openjdk bot commented Feb 28, 2023

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 Feb 28, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 28, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Feb 28, 2023

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@GoeLin
Copy link
Member Author

GoeLin commented Feb 28, 2023

Pre-submit fialure: unrelated build problem: /usr/bin/bash: line 1: /usr/bin/zip: Bad address

@openjdk
Copy link

openjdk bot commented Mar 1, 2023

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

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

8235448: code cleanup in SSLContextImpl.java

Reviewed-by: mbaesken

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

  • 5802a9a: 8245654: Add Certigna Root CA
  • 86b8ea8: 8295777: java/net/httpclient/ConnectExceptionTest.java should not rely on system resolver
  • d21d985: 8279941: sun/security/pkcs11/Signature/TestDSAKeyLength.java fails when NSS version detection fails
  • 558eab2: 8292877: java/util/concurrent/atomic/Serial.java uses {Double,Long}Accumulator incorrectly
  • 6ed8694: 8282219: jdk/java/lang/ProcessBuilder/Basic.java fails on AIX
  • 18c06bb: 8279662: serviceability/sa/ClhsdbScanOops.java can fail due to unexpected GC
  • cf58d59: 8277346: ProblemList 7 serviceability/sa tests on macosx-x64
  • 64434da: 8254267: javax/xml/crypto/dsig/LogParameters.java failed with "RuntimeException: Unexpected log output:"

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 Mar 1, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Mar 1, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Mar 1, 2023

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

  • 5802a9a: 8245654: Add Certigna Root CA
  • 86b8ea8: 8295777: java/net/httpclient/ConnectExceptionTest.java should not rely on system resolver
  • d21d985: 8279941: sun/security/pkcs11/Signature/TestDSAKeyLength.java fails when NSS version detection fails
  • 558eab2: 8292877: java/util/concurrent/atomic/Serial.java uses {Double,Long}Accumulator incorrectly
  • 6ed8694: 8282219: jdk/java/lang/ProcessBuilder/Basic.java fails on AIX
  • 18c06bb: 8279662: serviceability/sa/ClhsdbScanOops.java can fail due to unexpected GC
  • cf58d59: 8277346: ProblemList 7 serviceability/sa tests on macosx-x64
  • 64434da: 8254267: javax/xml/crypto/dsig/LogParameters.java failed with "RuntimeException: Unexpected log output:"

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 1, 2023
@openjdk openjdk bot closed this Mar 1, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 1, 2023
@openjdk
Copy link

openjdk bot commented Mar 1, 2023

@GoeLin Pushed as commit 15bdc4d.

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

@GoeLin GoeLin deleted the goetz_backport_8235448 branch March 1, 2023 14:44
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
Development

Successfully merging this pull request may close these issues.

2 participants