Integrated: 8354464: Additional cleanup setting up native.encoding
Stuart Marks
smarks at openjdk.org
Thu Apr 17 18:33:55 UTC 2025
On Sat, 12 Apr 2025 02:19:35 GMT, Stuart Marks <smarks at openjdk.org> wrote:
> Remove the #ifdef MACOSX from platform-independent System.c, which (on Mac) sets native.encoding from sprops.encoding or (on non-Mac Unix and Windows) sets native.encoding from sprops.sun_jnu_encoding. After this removal, the native.encoding property will be set from sprops.encoding and the sun.jnu.encoding property will be set from sprops.sun_jnu_encoding.
>
> Change the windows java_props_md.c so that it initializes sprops.sun_jnu_encoding and then copies that value to sprops.encoding. Previously, sprops.encoding was initialized with data from other Windows APIs, but this value was ignored by platform-independent code, which was kind of confusing.
>
> There are no changes to the Unix (Mac & non-Mac) platform-specific code. It already has code to set sprops.encoding and sprops.sun_jnu_encoding properly, including macOS-specific code to set the latter to UTF-8 unconditionally.
>
> There should be no behavior changes on any platform.
>
> I changed variable names in windows/java_props_md.c to make it clear that the values stored into them are unused. Of course there are other possibilities here, such as changing the interface to SetupI18nProps(). I'm open to suggestions.
This pull request has now been integrated.
Changeset: 7b061885
Author: Stuart Marks <smarks at openjdk.org>
URL: https://git.openjdk.org/jdk/commit/7b0618859a7764b0d4c8b893a19dfb64f4351c07
Stats: 38 lines in 3 files changed: 2 ins; 26 del; 10 mod
8354464: Additional cleanup setting up native.encoding
Reviewed-by: naoto, alanb
-------------
PR: https://git.openjdk.org/jdk/pull/24607
More information about the core-libs-dev
mailing list