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

8273790: Potential cyclic dependencies between Gregorian and CalendarSystem #127

Closed
wants to merge 1 commit into from

Conversation

yan-too
Copy link
Collaborator

@yan-too yan-too commented Nov 1, 2021

Clean backport of a potential deadlock fix. The test works fine: does pass after the fix, timeouts before.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8273790: Potential cyclic dependencies between Gregorian and CalendarSystem

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk15u-dev pull/127/head:pull/127
$ git checkout pull/127

Update a local copy of the PR:
$ git checkout pull/127
$ git pull https://git.openjdk.java.net/jdk15u-dev pull/127/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 127

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk15u-dev/pull/127.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 1, 2021

👋 Welcome back yan! 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 openjdk bot changed the title Backport ddc262746aea99050b9a6484f51c7ddb8f4bc991 8273790: Potential cyclic dependencies between Gregorian and CalendarSystem Nov 1, 2021
@openjdk
Copy link

openjdk bot commented Nov 1, 2021

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

@openjdk
Copy link

openjdk bot commented Nov 1, 2021

@yan-too This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8273790: Potential cyclic dependencies between Gregorian and CalendarSystem

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:

  • b056995: 8253421: Initialize JFR trace-IDs with zero

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 1, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 1, 2021

Webrevs

@yan-too
Copy link
Collaborator Author

yan-too commented Nov 1, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 1, 2021

Going to push as commit 8716863.
Since your change was applied there has been 1 commit pushed to the master branch:

  • b056995: 8253421: Initialize JFR trace-IDs with zero

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 1, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 1, 2021
@openjdk
Copy link

openjdk bot commented Nov 1, 2021

@yan-too Pushed as commit 8716863.

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

@yan-too yan-too deleted the calend branch Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant