-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8351740: Clean up some code around initialization of encoding properties #24463
base: master
Are you sure you want to change the base?
8351740: Clean up some code around initialization of encoding properties #24463
Conversation
of SystemProps.java in order to reduce bulkiness of the diffs.
👋 Welcome back smarks! A progress list of the required criteria for merging this PR into |
@stuart-marks 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:
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 157 new commits pushed to the
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 |
@stuart-marks The following label will be automatically applied to this pull request:
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. |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the clean-up. Changing the index name from _file_encoding_NDX
to _native_encoding_NDX
really helps.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Some of the code that creates various encoding properties at JVM initialization time, such as file.encoding and native.encoding, could use some cleaning up. Cleanup is fairly minimal and should be mostly behavior-preserving. Changes include the following:
In the java_props.h and java_props_md.c files, add documentation and asserts that the sprops.encoding and sprops.sun_jnu_encoding members are always set to non-NULL by the platform-specific code.
In SystemProps.java, remove a null check that is now extraneous based on the above assertion.
In SystemProps.java, rearrange logic (with no behavior change) around handling of the "COMPAT" value for the file.encoding property.
In SystemProps.Raw, rename the platform properties array index from _file_encoding_NDX to _native_encoding_NDX.
In SystemProps.Raw.cmdProperties(), adjust the HashMap size computation. This should actually avoid resizing of the HashMap (unlike the earlier code).
Adjust various comments in several places for clarity and correctness.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24463/head:pull/24463
$ git checkout pull/24463
Update a local copy of the PR:
$ git checkout pull/24463
$ git pull https://git.openjdk.org/jdk.git pull/24463/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24463
View PR using the GUI difftool:
$ git pr show -t 24463
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24463.diff
Using Webrev
Link to Webrev Comment