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

8275767: JDK source code contains redundant boolean operations in jdk.charsets #6110

Closed
wants to merge 1 commit into from

Conversation

naotoj
Copy link
Member

@naotoj naotoj commented Oct 25, 2021

Trivial clean-up.


Progress

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

Issue

  • JDK-8275767: JDK source code contains redundant boolean operations in jdk.charsets

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6110

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 25, 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 label Oct 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 2021

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

  • i18n

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the i18n label Oct 25, 2021
@naotoj
Copy link
Member Author

@naotoj naotoj commented Oct 25, 2021

/label add core-libs, nio

@openjdk openjdk bot added core-libs nio labels Oct 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 2021

@naotoj
The core-libs label was successfully added.

The nio label was successfully added.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 25, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Oct 25, 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:

8275767: JDK source code contains redundant boolean operations in jdk.charsets

Reviewed-by: lancea, rriggs, iris

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

  • 89671aa: 8273712: C2: Add mechanism for rejecting inlining of low frequency call sites and deprecate MinInliningThreshold.
  • 3221a14: 8273678: TableAccessibility and TableRowAccessibility miss autorelease
  • 7cf68b1: 8202932: java/awt/Component/NativeInLightShow/NativeInLightShow.java fails
  • f610ef0: 8196440: Regression automated Test 'java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java' fails
  • f143d2a: 8268595: java/io/Serializable/serialFilter/GlobalFilterTest.java#id1 failed in timeout
  • 7f94302: 8275511: G1: Rename needs_remset_update to remset_is_tracked in G1HeapRegionAttr
  • 0bcc174: 8275717: Reimplement STATIC_ASSERT to use static_assert
  • f623298: 8271199: Mutual TLS handshake fails signing client certificate with custom sensitive PKCS11 key
  • 1da5e6b: 8275104: IR framework does not handle client VM builds correctly
  • 5dab76b: 8275381: G1: refactor 2 constructors of G1CardSetConfiguration
  • ... and 83 more: https://git.openjdk.java.net/jdk/compare/895e2bd7c0bded5283eca8792fbfb287bb75016b...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 label Oct 25, 2021
@RogerRiggs
Copy link
Contributor

@RogerRiggs RogerRiggs commented Oct 25, 2021

Given that the code has been that way for a long time, did you check that both paths work as intended and that tests exist for both paths?

@naotoj
Copy link
Member Author

@naotoj naotoj commented Oct 25, 2021

No, I did not check. I simply removed the true && as it is logically correct. There's a test specifying IBM964 in sun.nio.cs.TestIBMBugs.java, but not sure it tests both paths or not.

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

LGTM

@naotoj
Copy link
Member Author

@naotoj naotoj commented Oct 26, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 26, 2021

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

  • 4961373: 8275137: jdk.unsupported/sun.reflect.ReflectionFactory.readObjectNoDataForSerialization uses wrong signature
  • 174f553: 8275869: Problem list applications/jcstress/copy.java on Linux-aarch64
  • 3ff085e: 8275582: Don't purge metaspace mapping lists
  • 10e1610: 8251134: Unwrapping a key with a Private Key generated by Microsoft CNG fails
  • 4361945: 8185844: MSCAPI doesn't list aliases correctly
  • 337a9b7: 8269853: Prefetch::read should accept pointer to const
  • 97d3280: 8275536: Add test to check that File::lastModified returns same time stamp as Files.getLastModifiedTime
  • 89671aa: 8273712: C2: Add mechanism for rejecting inlining of low frequency call sites and deprecate MinInliningThreshold.
  • 3221a14: 8273678: TableAccessibility and TableRowAccessibility miss autorelease
  • 7cf68b1: 8202932: java/awt/Component/NativeInLightShow/NativeInLightShow.java fails
  • ... and 90 more: https://git.openjdk.java.net/jdk/compare/895e2bd7c0bded5283eca8792fbfb287bb75016b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 26, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 26, 2021

@naotoj Pushed as commit 63e0f34.

💡 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 i18n integrated nio
4 participants