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

8280786: Build failure on Solaris after 8262392 #799

Closed
wants to merge 1 commit into from

Conversation

dimitryc
Copy link
Contributor

@dimitryc dimitryc commented Jan 27, 2022

The backport of JDK-8262392 unintentionally reverted the JDK modification that was made as a part of older update JDK-8232154 [1].

The patch restores the change to fix Solaris build.

[1] https://hg.openjdk.java.net/jdk-updates/jdk11u/rev/5c8bebe4b4d3#l7.730


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/799/head:pull/799
$ git checkout pull/799

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 799

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/799.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 27, 2022

👋 Welcome back dcherepanov! 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 Jan 27, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 27, 2022

Webrevs

bae
bae approved these changes Jan 27, 2022
Copy link

@bae bae left a comment

The proposed change looks fine to me.

@openjdk
Copy link

openjdk bot commented Jan 27, 2022

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

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

8280786: Build failure on Solaris after 8262392

Reviewed-by: bae, shade

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 1 new commit pushed to the master branch:

  • b6df150: 8278758: runtime/BootstrapMethod/BSMCalledTwice.java fails with release VMs after JDK-8262134

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 label Jan 27, 2022
Copy link
Contributor

@shipilev shipilev left a comment

All right, so 11u backport matches the mainline patch, right?
And mainline is not "affected", because it dropped support for Solaris in JDK 15?
If so, this looks good.,

@dimitryc
Copy link
Contributor Author

dimitryc commented Jan 27, 2022

All right, so 11u backport matches the mainline patch, right?
And mainline is not "affected", because it dropped support for Solaris in JDK 15?
If so, this looks good.,

Yes, that's correct.

@dimitryc
Copy link
Contributor Author

dimitryc commented Jan 27, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jan 27, 2022

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

  • b240c60: 8218546: Unable to connect to https://google.com using java.net.HttpClient
  • b6df150: 8278758: runtime/BootstrapMethod/BSMCalledTwice.java fails with release VMs after JDK-8262134

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 27, 2022
@openjdk openjdk bot closed this Jan 27, 2022
@openjdk openjdk bot removed ready rfr labels Jan 27, 2022
@openjdk
Copy link

openjdk bot commented Jan 27, 2022

@dimitryc Pushed as commit 6837e14.

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

@dimitryc dimitryc deleted the 8280786-solaris-build branch Jan 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated
3 participants