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

8344795: Remove uses of AccessControlContext in java.desktop module #22308

Closed
wants to merge 2 commits into from

Conversation

prrace
Copy link
Contributor

@prrace prrace commented Nov 21, 2024

This removes uses of AccessControlContext in java.desktop


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8344795: Remove uses of AccessControlContext in java.desktop module (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22308/head:pull/22308
$ git checkout pull/22308

Update a local copy of the PR:
$ git checkout pull/22308
$ git pull https://git.openjdk.org/jdk.git pull/22308/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22308

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22308.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 21, 2024

👋 Welcome back prr! 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
Copy link

openjdk bot commented Nov 21, 2024

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

8344795: Remove uses of AccessControlContext in java.desktop module

Reviewed-by: azvegint

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

  • 2ea0364: 8343893: Test jdk/jfr/event/runtime/TestNativeMemoryUsageEvents.java failed: heap should have grown and NMT should show that: expected 0 > 0
  • 50c099d: 8344799: Remove permissions checks from java.awt.Desktop
  • e21d06f: 8344338: javax/swing/JTextArea/bug4265784.java fails on Ubuntu 24.04.1
  • db44e97: 8344798: Shenandoah: Use more descriptive variable names in shPhaseTimings.cpp
  • c199f53: 8344336: SM cleanup of java.lang.System, Runtime, String, StackWalker
  • 0f458e2: 8342903: Deprecate for removal java.awt.Window.getWarningString()
  • efeacfe: 8344646: The libjsig deprecation warning should go to stderr not stdout
  • 2214906: 8272339: Update notes section from serialver man page

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 changed the title 8344795 8344795: Remove uses of AccessControlContext in java.desktop module Nov 21, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 21, 2024
@openjdk
Copy link

openjdk bot commented Nov 21, 2024

@prrace The following labels will be automatically applied to this pull request:

  • client
  • i18n

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

mlbridge bot commented Nov 21, 2024

Webrevs

Copy link
Member

@azvegint azvegint left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the removal of the use of the AccessControlException should also be part of this PR.

there is only one usage:

./src/java.desktop/share/classes/java/awt/Dialog.java:36:import java.security.AccessControlException;
./src/java.desktop/share/classes/java/awt/Dialog.java:1597:        } catch (@SuppressWarnings("removal") AccessControlException ace) {

And it seems that the java.awt.Dialog#checkModalityPermission() has became obsolete.

@prrace
Copy link
Contributor Author

prrace commented Nov 22, 2024

I think the removal of the use of the AccessControlException should also be part of this PR.

there is only one usage:

./src/java.desktop/share/classes/java/awt/Dialog.java:36:import java.security.AccessControlException;
./src/java.desktop/share/classes/java/awt/Dialog.java:1597:        } catch (@SuppressWarnings("removal") AccessControlException ace) {

And it seems that the java.awt.Dialog#checkModalityPermission() has became obsolete.

I deliberately left these alone, because it is part of removing most AWTPermissions which I have partially prepared already for a separate PR.
The fix will come soon, perhaps tomorrow, perhaps Monday.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 22, 2024
@prrace
Copy link
Contributor Author

prrace commented Nov 22, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Nov 22, 2024

Going to push as commit 4b16530.
Since your change was applied there have been 21 commits pushed to the master branch:

  • 5154b71: 8343598: Since Checker can mark some preview elements as new even if bytecode reference is identical
  • 8b98f95: 8298387: Implement JEP 497: Quantum-Resistant Module-Lattice-Based Digital Signature Algorithm
  • 21e0fb8: 8343529: serviceability/sa/ClhsdbWhere.java fails AssertionFailure: Corrupted constant pool
  • 13987b4: 8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism
  • 6d3becb: 8344861: Disable CheckJNICalls in tests until JDK-8344802 is fixed
  • 15dbb6a: 8344219: Remove calls to SecurityManager and doPrivileged in java.net.SocksSocketImpl after JEP 486 integration
  • 9769ee8: 8344652: Remove access control context text from SSLEngine and SSLSession APIs
  • 82c3612: 8344830: [BACKOUT] JDK-8341334: CDS: Parallel relocation
  • 64e4aa2: 8339916: AIOOBE due to Math.abs(Integer.MIN_VALUE) in tests
  • bf374c3: 8343453: Modernize FloatingDecimal tests
  • ... and 11 more: https://git.openjdk.org/jdk/compare/cee74f9e677e74deda72638bcc0a3e9307262938...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 22, 2024

@prrace Pushed as commit 4b16530.

💡 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
Development

Successfully merging this pull request may close these issues.

2 participants