-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8362291: [macOS] Remove finalize method in CGraphicsEnvironment.java #26332
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
Conversation
|
👋 Welcome back prr! A progress list of the required criteria for merging this PR into |
|
@prrace 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: 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 59 new commits pushed to the
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 |
Webrevs
|
src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
Outdated
Show resolved
Hide resolved
src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
Outdated
Show resolved
Hide resolved
| try { | ||
| deregisterDisplayReconfiguration(displayReconfigContext); | ||
| } catch (Throwable t) { | ||
| // Runs on disposer thread, can't allow an exception to escape. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about moving this "catch Throwable" into Disposer itself? As of now since #9890 we ignore "Exception" only.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can do that. I can't think of a problem with it.
I should probably then do the same for the other catches of Exception in that file.
I'm a bit on the fence about whether I should
- keep the print statements there
- remove them
- hide them behind a debugging option
I think I'll leave them alone and if we need to we can adjust in another PR.
| super.finalize(); | ||
| } finally { | ||
| private static class CGEDisposerRecord implements DisposerRecord { | ||
| private long displayReconfigContext; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
displayReconfigContext should be final
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
src/java.desktop/macosx/classes/sun/awt/CGraphicsEnvironment.java
Outdated
Show resolved
Hide resolved
|
/integrate |
|
Going to push as commit 523993e.
Your commit was automatically rebased without conflicts. |
Remove a finalize() method in CGraphicsEnvironment, replacing it with Disposer.
I don't see a way to add a test to verify this clean up.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26332/head:pull/26332$ git checkout pull/26332Update a local copy of the PR:
$ git checkout pull/26332$ git pull https://git.openjdk.org/jdk.git pull/26332/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26332View PR using the GUI difftool:
$ git pr show -t 26332Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26332.diff
Using Webrev
Link to Webrev Comment