8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable

[Deigue]

Backport changes from JDK-8288377

---

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-8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable

Reviewers

• Christoph Langer (@RealCLanger - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1328/head:pull/1328
$ git checkout pull/1328

Update a local copy of the PR:
$ git checkout pull/1328
$ git pull https://git.openjdk.org/jdk11u-dev pull/1328/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1328

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1328.diff

[bridgekeeper]

👋 Welcome back Deigue! 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]

This backport pull request has now been updated with issue from the original commit.

[mlbridge]

Webrevs

• 02: Full - Incremental (ccd724b8)
• 01: Full - Incremental (1195a019)
• 00: Full (712f18be)

[RealCLanger]

@Deigue: I suggest you backport this fix to jdk19u and jdk17u first before attempting to go back to jdk11u. Please also enable GitHub Actions on your repository to have some validation results.

[Deigue]

Yes, I will prep the PR for jdk17 and jdk19 repos. After looking at the error on enabling Github Actions here though, looks like a method from ProcessTools used in my jtreg test is using a different method signature in this repo, and might be the case in the other repos (jdk17,jdk19) as well. Not sure if an additional commit will be needed to fix it on the other repos, but I will check there and see. Otherwise, only will be needed to fix it here later on. Did not have the error occurring in the openjdk repo initially, so wasn't expecting errors.

[openjdk]

⚠️ @Deigue This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

[Deigue]

jdk17 PR: openjdk/jdk17u-dev#662
jdk19 PR: : openjdk/jdk19u#16
Also added additional commit to fix the test compile error happening only for the jdk11u-dev repo PR.

[RealCLanger]

jdk17 PR: openjdk/jdk17u-dev#662 jdk19 PR: : openjdk/jdk19u#16 Also added additional commit to fix the test compile error happening only for the jdk11u-dev repo PR.

OK, next step is to request backport approval by tagging the JBS bugs. I can do it for you, when you give me a Fix request comment statement (e.g. why you want to have it in the update releases, what testing you did, what's the risk etc.)

[Deigue]

Backport Request jdk-11u
Requesting this fix to be backported in order to address https://bugs.openjdk.org/browse/JDK-8288377 , which fixes the incorrect timezone displayed in DST period, when a custom TZ code is used. The risk is minimal as the code change is only a small piece of logic in how the offset between GMT and local time is calculated and returned. (offset fix) In addition, the repeat definition of the function for macOS has been consolidated, while keeping the macOS specific logic when it is needed. Tier 1 testing is passing on macOS and Linux.

Assuming that this backport approval request is step 6 of how to contribute a fix , I wanted to add that a small tweak was made to the original backport on jdk11u (this PR only, jdk-17 and jdk-19 are clean backports) , and thus as per step 5 I will be needing a code review on this PR as it won't be labeled as clean. The only new change was modifying the arguments to the createJavaProcessBuilder function as its function signature differs within this repo to accept String params instead of a List of Strings.

Please let me know if I need to also comment a request like this on both the other PRs as well, since they are going to be more or less quite similar.

[RealCLanger]

Looks good.

[RealCLanger]

Please let me know if I need to also comment a request like this on both the other PRs as well, since they are going to be more or less quite similar.

I added the fix request labels for all 3 update releases (19, 17 and 11) and posted the fix request comment on your behalf. Please monitor the JBS bug for further activity. I can sponsor the PRs when they are approved.

[openjdk]

@Deigue This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable

Reviewed-by: clanger

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

• b5dbfef: 8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
• dab4c44: 8285698: Create a test to check the focus stealing of JPopupMenu from JComboBox
• 7957658: 8210047: some pages contain content outside of landmark region
• bcdcc9f: 8240281: Remove failing assertion code when selecting first memory state in SuperWord::co_locate_pack
• 32d4246: 8193942: Regression automated test '/open/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java' fails
• 9ae65e8: 8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint
• 19d065b: Merge
• e9ba915: 8275887: jarsigner prints invalid digest/signature algorithm warnings if keysize is weak/disabled
• ad0878c: 8290209: jcup.md missing additional text
• 016bfd1: 8279066: entries.remove(entry) is useless in PKCS12KeyStore
• ... and 18 more: https://git.openjdk.org/jdk11u-dev/compare/c9f313574a20ef8069c2028d85d003f7b9c49b05...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealCLanger) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[Deigue]

/integrate

[openjdk]

@Deigue
Your change (at version ccd724b) is now ready to be sponsored by a Committer.

[RealCLanger]

/sponsor

[openjdk]

Going to push as commit 6e53ef2.
Since your change was applied there have been 28 commits pushed to the master branch:

• b5dbfef: 8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
• dab4c44: 8285698: Create a test to check the focus stealing of JPopupMenu from JComboBox
• 7957658: 8210047: some pages contain content outside of landmark region
• bcdcc9f: 8240281: Remove failing assertion code when selecting first memory state in SuperWord::co_locate_pack
• 32d4246: 8193942: Regression automated test '/open/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java' fails
• 9ae65e8: 8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint
• 19d065b: Merge
• e9ba915: 8275887: jarsigner prints invalid digest/signature algorithm warnings if keysize is weak/disabled
• ad0878c: 8290209: jcup.md missing additional text
• 016bfd1: 8279066: entries.remove(entry) is useless in PKCS12KeyStore
• ... and 18 more: https://git.openjdk.org/jdk11u-dev/compare/c9f313574a20ef8069c2028d85d003f7b9c49b05...master

Your commit was automatically rebased without conflicts.

[openjdk]

@RealCLanger @Deigue Pushed as commit 6e53ef2.

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