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

8236671: NullPointerException in JKS keystore #144

Closed
wants to merge 1 commit into from

Conversation

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jul 19, 2021

Clean backport of JDK-8236671 (only Copyright year update didn't apply automatically).


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 144

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 19, 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 276a1bf7675e32784870f5559f6d3ac8bea07b6e 8236671: NullPointerException in JKS keystore Jul 19, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 19, 2021

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 19, 2021

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Jul 20, 2021

/label add clean

@openjdk
Copy link

@openjdk openjdk bot commented Jul 20, 2021

@TheRealMDoerr The label clean is not a valid label. These labels are valid:

@openjdk
Copy link

@openjdk openjdk bot commented Jul 20, 2021

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

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

8236671: NullPointerException in JKS keystore

Reviewed-by: clanger

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 1 new commit pushed to the master branch:

  • 2696643: 8254967: com.sun.net.HttpsServer spins on TLS session close

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 Jul 20, 2021
@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Jul 21, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 21, 2021

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

  • 240ef44: 8267042: bug in monitor locking/unlocking on ARM32 C1 due to uninitialized BasicObjectLock::_displaced_header
  • 2696643: 8254967: com.sun.net.HttpsServer spins on TLS session close

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 21, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 21, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 21, 2021

@TheRealMDoerr Pushed as commit 44ef6fe.

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

@TheRealMDoerr TheRealMDoerr deleted the 8236671_keystore branch Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants