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

8313231: Redundant if statement in ZoneInfoFile #15052

Closed
wants to merge 1 commit into from

Conversation

johnshajiang
Copy link
Member

@johnshajiang johnshajiang commented Jul 27, 2023

if (i < savingsInstantTransitions.length) {
    // javazic writes the last GMT offset into index 0!
    if (i < savingsInstantTransitions.length) {
        offsets[0] = standardOffsets[standardOffsets.length - 1] * 1000;
        nOffsets = 1;
    }
    ...
}

The second if statement looks unnecessary.


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-8313231: Redundant if statement in ZoneInfoFile (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15052/head:pull/15052
$ git checkout pull/15052

Update a local copy of the PR:
$ git checkout pull/15052
$ git pull https://git.openjdk.org/jdk.git pull/15052/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15052

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15052.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 27, 2023

👋 Welcome back jjiang! 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 Jul 27, 2023
@openjdk
Copy link

openjdk bot commented Jul 27, 2023

@johnshajiang 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 Jul 27, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 27, 2023

Webrevs

Copy link
Member

@DamonFool DamonFool left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openjdk
Copy link

openjdk bot commented Jul 27, 2023

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

8313231: Redundant if statement in ZoneInfoFile

Reviewed-by: jiefu, scolebourne

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

  • ad34be1: 8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
  • d6245b6: 8310268: RISC-V: misaligned memory access in String.Compare intrinsic
  • 402cb6a: 8312201: Clean up common behavior in "page writers" and "member writers"
  • 23755f9: 8312411: MessageFormat.formatToCharacterIterator() can be improved
  • e2cb0bc: 8313204: Inconsistent order of sections in generated class documentation
  • 4ae75ca: 8313253: Rename methods in javadoc Comparators class
  • e897041: 8312262: Klass::array_klass() should return ArrayKlass pointer
  • a9a3463: 8312416: Tests in Locale should have more descriptive names
  • d9559f9: 8312612: handle WideCharToMultiByte return values
  • 34173ff: 8312574: jdk/jdk/jfr/jvm/TestChunkIntegrity.java fails with timeout
  • ... and 21 more: https://git.openjdk.org/jdk/compare/a9d21c61fb12a11e18c6bb8aa903e5a8e42473f1...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.

➡️ 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 Jul 27, 2023
@@ -468,10 +468,9 @@ private static ZoneInfo getZoneInfo(String zoneId,
}
if (i < savingsInstantTransitions.length) {
// javazic writes the last GMT offset into index 0!
if (i < savingsInstantTransitions.length) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even my IDE flags it as always true. While it surely is redundant, I wonder if some other check was intended instead. @jodastephen?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is my code - I certainly don't remember it. This PR causes no effective change but be slightly neater, so I guess I approve the PR

@@ -468,10 +468,9 @@ private static ZoneInfo getZoneInfo(String zoneId,
}
if (i < savingsInstantTransitions.length) {
// javazic writes the last GMT offset into index 0!
if (i < savingsInstantTransitions.length) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is my code - I certainly don't remember it. This PR causes no effective change but be slightly neater, so I guess I approve the PR

@johnshajiang
Copy link
Member Author

@jodastephen @DamonFool @pavelrappo
Thanks for your reviews!

@johnshajiang
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 31, 2023

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

  • 807ca2d: 8313316: Disable runtime/ErrorHandling/MachCodeFramesInErrorFile.java on ppc64le
  • ad34be1: 8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
  • d6245b6: 8310268: RISC-V: misaligned memory access in String.Compare intrinsic
  • 402cb6a: 8312201: Clean up common behavior in "page writers" and "member writers"
  • 23755f9: 8312411: MessageFormat.formatToCharacterIterator() can be improved
  • e2cb0bc: 8313204: Inconsistent order of sections in generated class documentation
  • 4ae75ca: 8313253: Rename methods in javadoc Comparators class
  • e897041: 8312262: Klass::array_klass() should return ArrayKlass pointer
  • a9a3463: 8312416: Tests in Locale should have more descriptive names
  • d9559f9: 8312612: handle WideCharToMultiByte return values
  • ... and 22 more: https://git.openjdk.org/jdk/compare/a9d21c61fb12a11e18c6bb8aa903e5a8e42473f1...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 31, 2023
@openjdk openjdk bot closed this Jul 31, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 31, 2023
@openjdk
Copy link

openjdk bot commented Jul 31, 2023

@johnshajiang Pushed as commit f8c2b7f.

💡 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
4 participants