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

8262915: java.awt.color.ColorSpace.getName() is not thread-safe #2801

Closed
wants to merge 1 commit into from

Conversation

@mrserb
Copy link
Member

@mrserb mrserb commented Mar 3, 2021

The java.awt.color.ColorSpace.getName() method does not use any kind of synchronization to properly initialize and use the static cache for the color components names.


Progress

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

Issue

  • JDK-8262915: java.awt.color.ColorSpace.getName() is not thread-safe

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2801/head:pull/2801
$ git checkout pull/2801

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 3, 2021

👋 Welcome back serb! 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 3, 2021

@mrserb The following label will be automatically applied to this pull request:

  • 2d

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

Loading

@openjdk openjdk bot added the 2d label Mar 3, 2021
/**
* Lazy-initialized names of components in the color space.
*/
private transient volatile String [] compName;
Copy link
Member Author

@mrserb mrserb Mar 3, 2021

Choose a reason for hiding this comment

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

The volatile keyword is the only one necessary to fix this bug, everything else is a cleanup.

Loading

@@ -447,60 +451,37 @@ public int getNumComponents() {
/**
* Returns the name of the component given the component index.
*
* @param idx the component index
* @param component the component index
Copy link
Member Author

@mrserb mrserb Mar 3, 2021

Choose a reason for hiding this comment

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

All other methods use the "component" as a name of the component index.

Loading

Copy link
Member

@azvegint azvegint Mar 3, 2021

Choose a reason for hiding this comment

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

I guess it will require a CSR request.

Loading

Copy link
Member Author

@mrserb mrserb Mar 3, 2021

Choose a reason for hiding this comment

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

nope, it is just renaming of the parameter

Loading

if (compName == null) {
switch (type) {
Copy link
Member Author

@mrserb mrserb Mar 3, 2021

Choose a reason for hiding this comment

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

the "switch statement" is replaced by the "switch expression"

Loading

@mrserb mrserb marked this pull request as ready for review Mar 3, 2021
@openjdk openjdk bot added the rfr label Mar 3, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 3, 2021

Webrevs

Loading

@@ -447,60 +451,37 @@ public int getNumComponents() {
/**
* Returns the name of the component given the component index.
*
* @param idx the component index
* @param component the component index
Copy link
Member

@azvegint azvegint Mar 3, 2021

Choose a reason for hiding this comment

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

I guess it will require a CSR request.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Mar 3, 2021

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

8262915: java.awt.color.ColorSpace.getName() is not thread-safe

Reviewed-by: azvegint, aivanov

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 11 new commits pushed to the master branch:

  • 268d9b7: 8261447: MethodInvocationCounters frequently run into overflow
  • 75aa154: 8259267: Refactor LoaderLeak shell test as java test.
  • a118185: 8261862: Expand discussion of rationale for BigDecimal equals/compareTo semantics
  • 2d2ef08: 8262885: Shenandoah: FullGC prologue does not need to save/restore heap has_forwarded_object flag
  • 1d2c1e6: 8248314: Parallel: Parallelize parallel full gc Adjust Roots phase
  • 3d3eb5c: 8262368: wrong verifier message for bogus return type
  • 6d3c858: 8259235: javac crashes while attributing super method invocation
  • bf90e85: 8262926: JDK-8260966 broke AIX build
  • 54dfd79: 8262256: C2 intrinsincs should not modify IR when bailing out
  • 0265ab6: 8262466: linux libsaproc/DwarfParser.cpp delete DwarfParser object in early return
  • ... and 1 more: https://git.openjdk.java.net/jdk/compare/044e2a2a499ff63dffae355b2254ec6bfcc3e01d...master

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.

Loading

@openjdk openjdk bot added the ready label Mar 3, 2021
@mrserb
Copy link
Member Author

@mrserb mrserb commented Mar 3, 2021

/integrate

Loading

@openjdk openjdk bot closed this Mar 3, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 3, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 3, 2021

@mrserb Since your change was applied there have been 11 commits pushed to the master branch:

  • 268d9b7: 8261447: MethodInvocationCounters frequently run into overflow
  • 75aa154: 8259267: Refactor LoaderLeak shell test as java test.
  • a118185: 8261862: Expand discussion of rationale for BigDecimal equals/compareTo semantics
  • 2d2ef08: 8262885: Shenandoah: FullGC prologue does not need to save/restore heap has_forwarded_object flag
  • 1d2c1e6: 8248314: Parallel: Parallelize parallel full gc Adjust Roots phase
  • 3d3eb5c: 8262368: wrong verifier message for bogus return type
  • 6d3c858: 8259235: javac crashes while attributing super method invocation
  • bf90e85: 8262926: JDK-8260966 broke AIX build
  • 54dfd79: 8262256: C2 intrinsincs should not modify IR when bailing out
  • 0265ab6: 8262466: linux libsaproc/DwarfParser.cpp delete DwarfParser object in early return
  • ... and 1 more: https://git.openjdk.java.net/jdk/compare/044e2a2a499ff63dffae355b2254ec6bfcc3e01d...master

Your commit was automatically rebased without conflicts.

Pushed as commit b397472.

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

Loading

@mrserb mrserb deleted the JDK-8262915 branch Mar 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants