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

8212083: Handle remaining gc/lock native code and fix two strings #669

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Nov 25, 2021

I backport this for parity with 11.0.14-oracle.


Progress

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

Issue

  • JDK-8212083: Handle remaining gc/lock native code and fix two strings

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 669

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 25, 2021

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/665 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 7afa70096a3abb48666d13f8981f6d7651c4005e 8212083: Handle remaining gc/lock native code and fix two strings Nov 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 25, 2021

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

@openjdk openjdk bot added backport clean rfr labels Nov 25, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 25, 2021

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/665 to master Nov 29, 2021
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Nov 29, 2021

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout GoeLin-backport-b6850052
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Nov 29, 2021
@GoeLin GoeLin force-pushed the goetz_backport_8212083 branch from d1a6799 to a1c60fb Compare Nov 29, 2021
@openjdk openjdk bot added the clean label Nov 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

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

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

8212083: Handle remaining gc/lock native code and fix two strings

Migrate code to using wrapping JNI for exceptions

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Nov 29, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Nov 29, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 29, 2021

Going to push as commit ccb0ed3.

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

@openjdk openjdk bot commented Nov 29, 2021

@GoeLin Pushed as commit ccb0ed3.

💡 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_8212083 branch Nov 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
1 participant