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

8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java still fails with JNI warning on some Windows configurations #285

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Feb 23, 2024

Hi all,

This pull request contains a backport of JDK-8323664, commit 99c9ae12 from the openjdk/jdk repository.

The commit being backported was authored by Christoph Langer on 15 Feb 2024 and was reviewed by Phil Race, Matthias Baesken and Alexey Ivanov.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8323664 needs maintainer approval

Issue

  • JDK-8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java still fails with JNI warning on some Windows configurations (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 285

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 23, 2024

👋 Welcome back clanger! 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 99c9ae127c0a3b8c4fc6ede87079ff7c693a2905 8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java still fails with JNI warning on some Windows configurations Feb 23, 2024
@openjdk
Copy link

openjdk bot commented Feb 23, 2024

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

@openjdk
Copy link

openjdk bot commented Feb 23, 2024

⚠️ @RealCLanger This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 23, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 23, 2024

Webrevs

@RealCLanger
Copy link
Contributor Author

/approval request This hardens the awt debug build against JNI warnings during assertions. The risk is low as only debug & test code is affected. Testing: GHA and SAP nightlies.

@openjdk
Copy link

openjdk bot commented Feb 23, 2024

@RealCLanger
8323664: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Feb 23, 2024
@openjdk
Copy link

openjdk bot commented Feb 27, 2024

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

8323664: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java still fails with JNI warning on some Windows configurations

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

  • 1b7c5af: 8321151: JDK-8294427 breaks Windows L&F on all older Windows versions
  • 55f9bcf: 8325876: crashes in docker container tests on Linuxppc64le Power8 machines
  • 69aa4ab: 8325470: [AIX] use fclose after fopen in read_psinfo
  • 08f9237: 8320303: Allow PassFailJFrame to accept single window creator

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 and removed approval labels Feb 27, 2024
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 27, 2024

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

  • 4296ddf: 8325496: Make TrimNativeHeapInterval a product switch
  • 1b7c5af: 8321151: JDK-8294427 breaks Windows L&F on all older Windows versions
  • 55f9bcf: 8325876: crashes in docker container tests on Linuxppc64le Power8 machines
  • 69aa4ab: 8325470: [AIX] use fclose after fopen in read_psinfo
  • 08f9237: 8320303: Allow PassFailJFrame to accept single window creator

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 27, 2024

@RealCLanger Pushed as commit 36b5ac4.

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

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
Development

Successfully merging this pull request may close these issues.

1 participant