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

8337669: [17u] Backport of JDK-8284047 missed to delete a file #2767

Closed
wants to merge 2 commits into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Aug 1, 2024

The backport of JDK-8284047 to jdk17u should have deleted the file test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketBruceForceClose.java but it didn't. Let's do it now.


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-8337669 needs maintainer approval

Issue

  • JDK-8337669: [17u] Backport of JDK-8284047 missed to delete a file (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2767

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 1, 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
Copy link

openjdk bot commented Aug 1, 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:

8337669: [17u] Backport of JDK-8284047 missed to delete a file

Reviewed-by: mbaesken, shade

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:

  • ae7be19: 8335536: Fix assertion failure in IdealGraphPrinter when append is true
  • 1f14f86: 8306929: Avoid CleanClassLoaderDataMetaspaces safepoints when previous versions are shared
  • 37726c5: 8336301: test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java leaves around a FIFO file upon test completion
  • 66fa756: 8317112: Add screenshot for Frame/DefaultSizeTest.java

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 the rfr Pull request is ready for review label Aug 1, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 1, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 1, 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.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Honestly, I don't find it very surprising that a file with that typo in its name dies really hard.

@openjdk openjdk bot added the approval label Aug 2, 2024
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Aug 7, 2024
@GoeLin
Copy link
Member

GoeLin commented Aug 7, 2024

Oh, thanks for fixing this!

@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 7, 2024

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

  • 7230baf: 8283728: jdk.hotspot.agent: Wrong location for RISCV64ThreadContext.java
  • ae7be19: 8335536: Fix assertion failure in IdealGraphPrinter when append is true
  • 1f14f86: 8306929: Avoid CleanClassLoaderDataMetaspaces safepoints when previous versions are shared
  • 37726c5: 8336301: test/jdk/java/nio/channels/AsyncCloseAndInterrupt.java leaves around a FIFO file upon test completion
  • 66fa756: 8317112: Add screenshot for Frame/DefaultSizeTest.java

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 7, 2024

@RealCLanger Pushed as commit 396e209.

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

@RealCLanger RealCLanger deleted the deletebruce branch August 7, 2024 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants