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

8205076: [17u] Inet6AddressImpl.c: lookupIfLocalHost accesses int InetAddress.preferIPv6Address as a boolean #2769

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jun 13, 2024

This is a 11u and 17u -specific bug, see JBS and its comments for more details. I think we can fix this by explicitly checking against the PREFER_IPV6_VALUE, like post JDK 18 code does.

It is a bit weird to backport the issue with [17u] in title, but I think it is the cleanest way to make sure we backport the same fix 17u already ships with.

Additional testing:

  • macos-aarch64-server-fastdebug, DcmdMBeanTestCheckJni.java now passes
  • macos-aarch64-server-fastdebug, jdk_net

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8205076 needs maintainer approval

Issue

  • JDK-8205076: [17u] Inet6AddressImpl.c: lookupIfLocalHost accesses int InetAddress.preferIPv6Address as a boolean (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2769

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 13, 2024

👋 Welcome back shade! 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
Copy link

openjdk bot commented Jun 13, 2024

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

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

8205076: [17u] Inet6AddressImpl.c: `lookupIfLocalHost` accesses `int InetAddress.preferIPv6Address` as a boolean

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:

  • f08e5e8: 8316240: Open source several add/remove MenuBar manual tests
  • 3901633: 8280392: java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java failed with "RuntimeException: Test failed."

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 changed the title Backport 3eb15b02b5efeb065ada8c6ae2bc8718e7892deb 8205076: [17u] Inet6AddressImpl.c: lookupIfLocalHost accesses int InetAddress.preferIPv6Address as a boolean Jun 13, 2024
@openjdk
Copy link

openjdk bot commented Jun 13, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 13, 2024

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 13, 2024
@shipilev
Copy link
Member Author

/approval request Backport for 11u/17u-specific fix, does what upstream code already do post JDK 18, and in JDK 17. Testing passes on platform where tests used to fail.

@openjdk
Copy link

openjdk bot commented Jun 13, 2024

@shipilev
8205076: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jun 13, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 13, 2024

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jun 14, 2024
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 17, 2024

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

  • 7d4ef49: 8329510: Update ProblemList for JFileChooser/8194044/FileSystemRootTest.java
  • 2e4179b: 8325179: Race in BasicDirectoryModel.validateFileCache
  • f08e5e8: 8316240: Open source several add/remove MenuBar manual tests
  • 3901633: 8280392: java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java failed with "RuntimeException: Test failed."

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 17, 2024

@shipilev Pushed as commit 667bbd3.

💡 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
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant