8383825: Incorrect handling of Hawaii_Aleutian metazone#31046
8383825: Incorrect handling of Hawaii_Aleutian metazone#31046naotoj wants to merge 1 commit intoopenjdk:masterfrom
Conversation
|
👋 Welcome back naoto! A progress list of the required criteria for merging this PR into |
|
@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: 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 17 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 |
This fixes a regression found while backporting the fix for JDK-8382020.
The previous fix records metazone names only when processing the default (001) time zone for the metazone. However, it did not handle the case where that default time zone also has its own zone-specific names.
This does not show up in mainline for
Hawaii_Aleutianmetazone, because the metazone's default time zone isAmerica/Adak, which maps back to theHawaii_Aleutianmetazone. In JDK 25, however, the default time zone forHawaii_AleutianisPacific/Honolulu, which has its own zone-specific names so that Hawaii can use short names such asHST/HDTinstead ofHAST/HADT.As a result, when the JDK-8382020 fix is backported to JDK 25, the
Hawaii_Aleutianmetazone names are not generated during the build. This change processes metazone names before zone-specific names, so the default-zone metazone entry is still recorded even when the default zone has its own names.Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/31046/head:pull/31046$ git checkout pull/31046Update a local copy of the PR:
$ git checkout pull/31046$ git pull https://git.openjdk.org/jdk.git pull/31046/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 31046View PR using the GUI difftool:
$ git pr show -t 31046Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/31046.diff
Using Webrev
Link to Webrev Comment