Navigation Menu

Skip to content
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

8274864: Remove Amman/Cairo hacks in ZoneInfoFile #5857

Closed
wants to merge 1 commit into from

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Oct 7, 2021

While working on tzdata2021c update, I noticed there is a dead code in sun.util.calendar.ZoneInfoFile, which was used to tweak the rules for endOfDay for certain cases. These are no longer needed as JDK's code is already capable of dealing with transitions beyond the end of the day.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274864: Remove Amman/Cairo hacks in ZoneInfoFile

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5857/head:pull/5857
$ git checkout pull/5857

Update a local copy of the PR:
$ git checkout pull/5857
$ git pull https://git.openjdk.java.net/jdk pull/5857/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5857

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5857.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 7, 2021

👋 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 openjdk bot added the rfr Pull request is ready for review label Oct 7, 2021
@openjdk
Copy link

openjdk bot commented Oct 7, 2021

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

  • core-libs
  • i18n

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.

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org labels Oct 7, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 7, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 7, 2021

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

8274864: Remove Amman/Cairo hacks in ZoneInfoFile

Reviewed-by: iris, joehw

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

  • 97ea9dd: 8274840: Update OS detection code to recognize Windows 11
  • 8de7763: 8273152: Refactor CDS FileMapHeader loading code

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 7, 2021
@naotoj
Copy link
Member Author

naotoj commented Oct 8, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Oct 8, 2021

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

  • ccbce10: 8272756: Remove unnecessary explicit initialization of volatile variables in java.desktop
  • 36b89a1: 8274785: ciReplay: Potential crash due to uninitialized Compile::_ilt variable
  • 2aacd42: 8274145: C2: condition incorrectly made redundant with dominating main loop exit condition
  • 6364719: 8274004: Change 'nonleaf' rank name
  • b60837a: 8272586: emit abstract machine code in hs-err logs
  • 97ea9dd: 8274840: Update OS detection code to recognize Windows 11
  • 8de7763: 8273152: Refactor CDS FileMapHeader loading code

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 8, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 8, 2021
@openjdk
Copy link

openjdk bot commented Oct 8, 2021

@naotoj Pushed as commit ec19907.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org i18n i18n-dev@openjdk.org integrated Pull request has been integrated
3 participants