Skip to content
This repository was archived by the owner on Oct 9, 2025. It is now read-only.

Conversation

@coffeys
Copy link
Contributor

@coffeys coffeys commented Jan 24, 2025

Clean backport of the jdk 25 patch


Progress

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

Issue

  • JDK-8344361: Restore null return for invalid services from legacy providers (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 31

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk24u/pull/31.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 24, 2025

👋 Welcome back coffeys! 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 Jan 24, 2025

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

8344361: Restore null return for invalid services from legacy providers

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 1 new commit pushed to the master branch:

  • 265841e: 8211851: (ch) java/nio/channels/AsynchronousSocketChannel/StressLoopback.java times out (aix)

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 Backport e20bd018c4046870d0cf632bb8e5440cb9f5c3c2 8344361: Restore null return for invalid services from legacy providers Jan 24, 2025
@openjdk
Copy link

openjdk bot commented Jan 24, 2025

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

@openjdk
Copy link

openjdk bot commented Jan 24, 2025

⚠️ @coffeys 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 Jan 24, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 24, 2025

Webrevs

@coffeys
Copy link
Contributor Author

coffeys commented Jan 24, 2025

/approval request Correct a recent regression

@openjdk
Copy link

openjdk bot commented Jan 24, 2025

@coffeys
8344361: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jan 24, 2025
@coffeys
Copy link
Contributor Author

coffeys commented Jan 28, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 28, 2025

Going to push as commit 12dca6d.
Since your change was applied there have been 8 commits pushed to the master branch:

  • b15a95e: 8347299: Add annotations to test cases in LicenseTest
  • c583ecf: 8347911: Limit the length of inflated text chunks
  • d0025e9: Merge
  • a315b93: 8347498: JDK 24 RDP2 L10n resource files update
  • ab43ba0: 8348327: Incorrect march flag when building libsleef/vector_math_neon.c
  • 564e0a2: 8342466: Improve API documentation for java.lang.classfile.attribute
  • b00bb04: 8347129: cpuset cgroups controller is required for no good reason
  • 265841e: 8211851: (ch) java/nio/channels/AsynchronousSocketChannel/StressLoopback.java times out (aix)

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 28, 2025

@coffeys Pushed as commit 12dca6d.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport clean integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant