Skip to content

Conversation

jankratochvil
Copy link

@jankratochvil jankratochvil commented Sep 6, 2025

It is needed in jdk8 as a prerequisite for JDK-8347377.
A testcase is included.
It is not a clean backport - source files are moved, copyright years update, original patch uses extra function getStandardProfileInputStream(), Anton Voznia hasn't implemented it by himself, he borrowed it from another patch https://bugs.openjdk.org/browse/JDK-8039271 and changed it a bit according to the requirements. He didn't include entire fix because it's redundant.
This backport is authored by Anton Voznia, I am only submitting it. Anton Voznia is an Azul employee so he should be covered by Azul OCA. Anton Voznia has not signed a personal OCA from Oracle.
It requires #690 as a prerequisite.


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

Integration blocker

 ⚠️ Dependency #690 must be integrated first

Issue

  • JDK-6986863: ProfileDeferralMgr throwing ConcurrentModificationException (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 691

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 6, 2025

👋 Welcome back jkratochvil! A progress list of the required criteria for merging this PR into pr/690 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 Sep 6, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 64a150c518ed1a936cd6e4cb5e60060243496901 6986863: ProfileDeferralMgr throwing ConcurrentModificationException Sep 6, 2025
@openjdk
Copy link

openjdk bot commented Sep 6, 2025

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Sep 6, 2025
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2025

Webrevs

@jankratochvil jankratochvil marked this pull request as draft September 7, 2025 20:19
@openjdk openjdk bot removed the rfr Pull request is ready for review label Sep 7, 2025
@openjdk
Copy link

openjdk bot commented Sep 8, 2025

@jankratochvil this pull request can not be integrated into pr/690 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 8263622-6986863
git fetch https://git.openjdk.org/jdk8u-dev.git pr/690
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge pr/690"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 8, 2025
@jankratochvil jankratochvil marked this pull request as ready for review September 8, 2025 14:19
@jankratochvil jankratochvil marked this pull request as draft September 8, 2025 14:20
@openjdk openjdk bot added rfr Pull request is ready for review and removed merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review labels Sep 8, 2025
@jankratochvil
Copy link
Author

The CI errors are false positives, they are the same as unpatched sources tested in: jankratochvil#1

@jankratochvil jankratochvil marked this pull request as ready for review September 9, 2025 09:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Port of a pull request already in a different code base rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

1 participant