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

8211432: [REDO] Handle JNIGlobalRefLocker.cpp #665

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 665

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 25, 2021

👋 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 b68500521e7119efbe0f0d827186f6060c1a9b08 8211432: [REDO] Handle JNIGlobalRefLocker.cpp Nov 25, 2021
@openjdk
Copy link

openjdk bot commented Nov 25, 2021

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

@openjdk
Copy link

openjdk bot commented Nov 25, 2021

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

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

8211432: [REDO] Handle JNIGlobalRefLocker.cpp

Adding a JNI verification wrapper for tests

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:

  • 84a3397: 8211905: Remove multiple casts for EM06 file

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 25, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 25, 2021

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Nov 29, 2021

/integrate

1 similar comment
@GoeLin
Copy link
Member Author

GoeLin commented Nov 29, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 29, 2021

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

  • 48dbaf1: 8261661: gc/stress/TestReclaimStringsLeaksMemory.java fails because Reserved memory size is too big
  • 242bbef: 8270290: NTLM authentication fails if HEAD request is used
  • c395d4b: 8211782: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[I-S]*
  • 384750d: 8211036: Remove the NSK_STUB macros from vmTestbase for non jvmti
  • b6a9e7e: 8250521: Configure initial RTO to use minimal retry for loopback connections on Windows
  • 7bdb8ac: 8248238: Implementation: JEP 388: Windows AArch64 Support
  • 19a1969: 8274773: [TESTBUG] UnsafeIntrinsicsTest intermittently fails on weak memory model platform
  • e59323f: 8277224: sun.security.pkcs.PKCS9Attributes.toString() throws NPE
  • 48b5a6a: 8277815: Fix mistakes in legal header backports
  • 87c04f2: 8211801: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/scenarios/[A-E]
  • ... and 1 more: https://git.openjdk.java.net/jdk11u-dev/compare/91c6420547fa5c7e274da343e799b9d926195fe3...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 29, 2021

@GoeLin Pushed as commit 1e0bb2d.

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

@openjdk
Copy link

openjdk bot commented Nov 29, 2021

@GoeLin The command integrate can only be used in open pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant