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

8214427: probable bug in logic of ConcurrentHashMap.addCount() #1114

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented May 29, 2022

Hi all,

This pull request contains a backport of commit 88461599 from the openjdk/jdk repository.

The commit being backported was authored by Doug Lea on 12 Dec 2018 and was reviewed by Martin Buchholz and David Holmes.

All 108 java.util.concurrent tests passed with the patch applied.

Thanks!


Progress

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

Issue

  • JDK-8214427: probable bug in logic of ConcurrentHashMap.addCount()

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1114

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 29, 2022

👋 Welcome back andrew! 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 8846159987f902bb6e2b966eb4656da4b6d9469d 8214427: probable bug in logic of ConcurrentHashMap.addCount() May 29, 2022
@openjdk
Copy link

openjdk bot commented May 29, 2022

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

@openjdk
Copy link

openjdk bot commented May 29, 2022

@gnu-andrew This change now passes all automated pre-integration checks.

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

8214427: probable bug in logic of ConcurrentHashMap.addCount()

Reviewed-by: martin

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 May 29, 2022
@mlbridge
Copy link

mlbridge bot commented May 29, 2022

Webrevs

@gnu-andrew
Copy link
Member Author

gnu-andrew commented May 30, 2022

Thanks Martin. I've flagged the bug for jdk11u approval.

@gnu-andrew
Copy link
Member Author

gnu-andrew commented Jun 2, 2022

I see jdk11u-fix-yes

@gnu-andrew
Copy link
Member Author

gnu-andrew commented Jun 2, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 2, 2022

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

  • e7036ec: 8283017: GHA: Workflows break with update release versions
  • 866f8f5: 8287202: GHA: Add macOS aarch64 to the list of default platforms for workflow_dispatch event
  • 25ac222: 8287017: Bump update version for OpenJDK: jdk-11.0.17
  • 1c93a6e: 8285720: test/jdk/java/nio/file/Files/probeContentType/Basic.java fails to compile after backport of 8273655
  • 7b58ca2: 8284094: Memory leak in invoker_completeInvokeRequest()
  • 27d4c1e: 8287362: FieldAccessWatch testcase failed on AIX platform
  • de59d51: 8285397: JNI exception pending in CUPSfuncs.c:250
  • 370730f: 8181571: printing to CUPS fails on mac sandbox app
  • 6faebb1: 8282422: JTable.print() failed with UnsupportedCharsetException on AIX ko_KR locale

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 2, 2022

@gnu-andrew Pushed as commit a2e6494.

💡 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 clean integrated Pull request has been integrated
2 participants