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

8320675: PrinterJob/SecurityDialogTest.java hangs #2807

Closed
wants to merge 6 commits into from

Conversation

luchenlin
Copy link

@luchenlin luchenlin commented Aug 15, 2024

I backport this for parity with 17.0.13-oracle.
modify lines are different, but code is clean.


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
  • JDK-8320675 needs maintainer approval

Issue

  • JDK-8320675: PrinterJob/SecurityDialogTest.java hangs (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2807

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 15, 2024

👋 Welcome back andrewlu! 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 Aug 15, 2024

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

8320675: PrinterJob/SecurityDialogTest.java hangs

Reviewed-by: phh

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

  • 7161e29: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 81b2c8d: 8286160: (fs) Files.exists returns unexpected results with C:\pagefile.sys because it's not readable
  • 6f99109: 8331405: Shenandoah: Optimize ShenandoahLock with TTAS
  • 3248a61: 8339548: GHA: RISC-V: Use Debian snapshot archive for bootstrap
  • 51395cf: 8326611: Clean up vmTestbase/nsk/stress/stack tests
  • 81ad499: 8294726: Update URLs in minefield tests
  • 98586bb: 8331626: unsafe.cpp:162:38: runtime error in index_oop_from_field_offset_long - applying non-zero offset 4563897424 to null pointer
  • d92d633: 8332720: ubsan: instanceKlass.cpp:3550:76: runtime error: member call on null pointer of type 'struct Array'
  • 91849bf: Merge
  • f95f7f4: 8338696: (fs) BasicFileAttributes.creationTime() falls back to epoch if birth time is unavailable (Linux)
  • ... and 39 more: https://git.openjdk.org/jdk17u-dev/compare/8dbd6772f9b65ab1ae6ef683c7300092e4745951...master

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 Backport 9f5ad43358a4e209b4cd1c91bcc86b997f371548 8320675: PrinterJob/SecurityDialogTest.java hangs Aug 15, 2024
@openjdk
Copy link

openjdk bot commented Aug 15, 2024

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Aug 15, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 15, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 15, 2024

⚠️ @luchenlin 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
Copy link

openjdk bot commented Aug 22, 2024

@luchenlin this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout andrewLu_backport_8320675
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Aug 22, 2024
@openjdk openjdk bot added approval and removed merge-conflict Pull request has merge conflict with target branch approval labels Aug 22, 2024
@luchenlin
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 2, 2024

@luchenlin This pull request has not yet been marked as ready for integration.

@GoeLin
Copy link
Member

GoeLin commented Sep 9, 2024

Hi Andrew,
they changed the review process. If a PR is modified after it has been reviewed, the review is invalidated and it need a new review. I'll take a look.

@GoeLin
Copy link
Member

GoeLin commented Sep 9, 2024

Hi Andrew,

can you please change the "/**" in line 38 to be "/*".
Also, please fix the indentation of the String list in INSTRUCTIONS
At the very end of the file a CR is missing.

Thanks, Goetz.

@openjdk
Copy link

openjdk bot commented Sep 9, 2024

⚠️ @luchenlin This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@luchenlin
Copy link
Author

Hi Andrew,

can you please change the "/**" in line 38 to be "/*". Also, please fix the indentation of the String list in INSTRUCTIONS At the very end of the file a CR is missing.

Thanks, Goetz.

hi @GoeLin , it's fixed, please check, thanks.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 13, 2024
@luchenlin
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 16, 2024

Going to push as commit 22f82b9.
Since your change was applied there have been 50 commits pushed to the master branch:

  • a5d9f49: 8296972: [macos13] java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java: getExtendedState() != 6 as expected.
  • 7161e29: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 81b2c8d: 8286160: (fs) Files.exists returns unexpected results with C:\pagefile.sys because it's not readable
  • 6f99109: 8331405: Shenandoah: Optimize ShenandoahLock with TTAS
  • 3248a61: 8339548: GHA: RISC-V: Use Debian snapshot archive for bootstrap
  • 51395cf: 8326611: Clean up vmTestbase/nsk/stress/stack tests
  • 81ad499: 8294726: Update URLs in minefield tests
  • 98586bb: 8331626: unsafe.cpp:162:38: runtime error in index_oop_from_field_offset_long - applying non-zero offset 4563897424 to null pointer
  • d92d633: 8332720: ubsan: instanceKlass.cpp:3550:76: runtime error: member call on null pointer of type 'struct Array'
  • 91849bf: Merge
  • ... and 40 more: https://git.openjdk.org/jdk17u-dev/compare/8dbd6772f9b65ab1ae6ef683c7300092e4745951...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 16, 2024

@luchenlin Pushed as commit 22f82b9.

💡 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 integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants