8167252: Some of Charset.availableCharsets() does not contain itself #14473

naotoj · 2023-06-14T16:47:40Z

Adding themselves into their contains() method will fix it.

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

Issue

JDK-8167252: Some of Charset.availableCharsets() does not contain itself (Bug - P4)

Reviewers

Brian Burkhalter (@bplb - Reviewer)
Alan Bateman (@AlanBateman - Reviewer)
Iris Clark (@irisclark - Reviewer)
Lance Andersen (@LanceAndersen - Reviewer)
Jaikiran Pai (@jaikiran - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14473

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14473.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2023-06-14T16:49:05Z

👋 Welcome back naoto! 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 · 2023-06-14T16:50:03Z

@naotoj The following labels will be automatically applied to this pull request:

i18n
nio

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

mlbridge · 2023-06-14T16:54:01Z

Webrevs

01: Full - Incremental (bea24165)
00: Full (89899160)

bplb

Looks all right.

openjdk · 2023-06-14T17:01:22Z

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

8167252: Some of Charset.availableCharsets() does not contain itself

Reviewed-by: bpb, alanb, iris, lancea, jpai

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

6b94289: 8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
181845a: 8309899: Rename PtrQueueSet::buffer_size()
931625a: 8309808: BytecodeTracer prints wrong BSM for invokedynamic
ee4ab67: 8309958: Incorrect @SInCE tag format in Container.java
57b8251: 8309956: Shenandoah: Strengthen the mark word check in string dedup

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.

LanceAndersen

Changes look fine over all.

It might be worth considering updating this to use junit at some point as a separate clean up activity as it could further streamline the test

LanceAndersen · 2023-06-14T17:14:08Z

test/jdk/java/nio/charset/Charset/Contains.java

@@ -103,6 +105,24 @@ static void checkUTF() throws Exception {
                   true);
    }

+    static void selfContainmentTest() {


Be nice to add a comment regarding the purpose of the test

The spec is that Charset::contains return true for self so maybe it could be renamed to containsSelfTest, might help with the understanding the purpose (along with a comment)

Good point. Will address these in the next iteration

bplb

Re-approved.

jaikiran · 2023-06-15T06:19:09Z

Hello Naoto, should sun.util.PropertyResourceBundleCharset be fixed too? Its contains() currently just returns false. Then there is sun.font.X11Johab in java.desktop module whose contains() appears to have a typo and is checking against an unrelated X11GB18030_1 instance.

AlanBateman · 2023-06-15T06:43:04Z

Hello Naoto, should sun.util.PropertyResourceBundleCharset be fixed too?

This is JDK internal, it shouldn't leak out via the APIs. If there is a way for it to leak out then it would require a compliant contains method but I suspect it's internal only.

jaikiran · 2023-06-15T07:20:53Z

Hello Alan,

Hello Naoto, should sun.util.PropertyResourceBundleCharset be fixed too?

This is JDK internal, it shouldn't leak out via the APIs. If there is a way for it to leak out then it would require a compliant contains method but I suspect it's internal only.

You are right this is an internal class (I just found these by checking which classes extend Charset). I now paid a closer attention to the title of this issue and this is more about the Charset(s) that are returned through the public API, so I think it's OK to leave these internal classes as-is at least in this PR.

naotoj · 2023-06-15T16:32:36Z

Thanks for the review, Jai.
As to PropertyResourceBundleCharset, yes it is an internal implementation as Alan mentioned, to auto detect UTF-8/ISO-8859-1, so even though contains() does not include itself, it is fine.

naotoj · 2023-06-15T16:33:24Z

/integrate

openjdk · 2023-06-15T16:34:02Z

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

653a8d0: 8310129: SetupNativeCompilation LIBS should match the order of the other parameters
947f149: 8308444: LoadStoreNode::result_not_used() is too conservative
8b4af46: 8309974: some JVMCI tests fail when VM options include -XX:+EnableJVMCI
0038491: 8309978: [x64] Fix useless padding
5f3613e: 8309960: ParallelGC young collections very slow in DelayInducer
83d9267: 8303513: C2: LoadKlassNode::make fails with 'expecting TypeKlassPtr'
de8aca2: 8307907: [ppc] Remove RTM locking implementation
4c0e164: 8309717: C2: Remove Arena::move_contents usage
6b94289: 8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
181845a: 8309899: Rename PtrQueueSet::buffer_size()
... and 3 more: https://git.openjdk.org/jdk/compare/955fc2fabafc4c4d79d137bf86194228d5cf8ad8...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-06-15T16:34:10Z

@naotoj Pushed as commit 3eeb681.

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

8167252: Some of Charset.availableCharsets() does not contain itself

8989916

openjdk bot added the rfr Pull request is ready for review label Jun 14, 2023

openjdk bot added nio nio-dev@openjdk.org i18n i18n-dev@openjdk.org labels Jun 14, 2023

bplb approved these changes Jun 14, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 14, 2023

AlanBateman approved these changes Jun 14, 2023

View reviewed changes

irisclark approved these changes Jun 14, 2023

View reviewed changes

LanceAndersen approved these changes Jun 14, 2023

View reviewed changes

Refined the test

bea2416

AlanBateman approved these changes Jun 14, 2023

View reviewed changes

LanceAndersen approved these changes Jun 14, 2023

View reviewed changes

bplb approved these changes Jun 14, 2023

View reviewed changes

irisclark approved these changes Jun 14, 2023

View reviewed changes

jaikiran approved these changes Jun 15, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 15, 2023

openjdk bot closed this Jun 15, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 15, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8167252: Some of Charset.availableCharsets() does not contain itself #14473

8167252: Some of Charset.availableCharsets() does not contain itself #14473

naotoj commented Jun 14, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jun 14, 2023

openjdk bot commented Jun 14, 2023

mlbridge bot commented Jun 14, 2023 •

edited

Loading

bplb left a comment

openjdk bot commented Jun 14, 2023 •

edited

Loading

LanceAndersen left a comment

LanceAndersen Jun 14, 2023

AlanBateman Jun 14, 2023

naotoj Jun 14, 2023

bplb left a comment

jaikiran commented Jun 15, 2023

AlanBateman commented Jun 15, 2023

jaikiran commented Jun 15, 2023

naotoj commented Jun 15, 2023

naotoj commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

8167252: Some of Charset.availableCharsets() does not contain itself #14473

8167252: Some of Charset.availableCharsets() does not contain itself #14473

Conversation

naotoj commented Jun 14, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jun 14, 2023

openjdk bot commented Jun 14, 2023

mlbridge bot commented Jun 14, 2023 • edited Loading

Webrevs

bplb left a comment

Choose a reason for hiding this comment

openjdk bot commented Jun 14, 2023 • edited Loading

LanceAndersen left a comment

Choose a reason for hiding this comment

LanceAndersen Jun 14, 2023

Choose a reason for hiding this comment

AlanBateman Jun 14, 2023

Choose a reason for hiding this comment

naotoj Jun 14, 2023

Choose a reason for hiding this comment

bplb left a comment

Choose a reason for hiding this comment

jaikiran commented Jun 15, 2023

AlanBateman commented Jun 15, 2023

jaikiran commented Jun 15, 2023

naotoj commented Jun 15, 2023

naotoj commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

openjdk bot commented Jun 15, 2023

naotoj commented Jun 14, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 14, 2023 •

edited

Loading

openjdk bot commented Jun 14, 2023 •

edited

Loading