Skip to content

Conversation

@akashche
Copy link
Contributor

@akashche akashche commented Nov 10, 2021

Clean backport of the WebSocket fix.

Additiona testing:

  • checked that jtreg:jdk/java/net/httpclient/websocket/java.net.http/ tests pass with the patch; these updated tests are not runnable without the patch due to MessageEncoder internal API change

Progress

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

Issue

  • JDK-8268294: Reusing HttpClient in a WebSocket.Listener hangs.

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 246

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 10, 2021

👋 Welcome back akasko! 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 changed the title Backport 2d088fa91d18252a801db3b84ff87e261d63ebd4 8268294: Reusing HttpClient in a WebSocket.Listener hangs. Nov 10, 2021
@openjdk
Copy link

openjdk bot commented Nov 10, 2021

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Nov 10, 2021
@openjdk
Copy link

openjdk bot commented Nov 10, 2021

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

8268294: Reusing HttpClient in a WebSocket.Listener hangs.

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 10, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 10, 2021

Webrevs

@akashche
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 15, 2021

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

  • b2f4dff: 8269481: SctpMultiChannel never releases own file descriptor
  • c3de885: 8273416: C2: assert(false) failed: bad AD file after JDK-8252372 with UseSSE={0,1}
  • ff4f533: 8274560: JFR: Add test for OldObjectSample event when using Shenandoah
  • 23b4496: 8268927: Windows: link error: unresolved external symbol "int __cdecl convert_to_unicode(char const *,wchar_t * *)"
  • a1036ef: 8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test
  • 193c7f1: 8274501: c2i entry barriers read int as long on AArch64
  • 3e349b4: 8276025: Hotspot's libsvml.so may conflict with user dependency
  • 58a6dae: 8275872: Sync J2DBench run and analyze Makefile targets with build.xml

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 15, 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 Nov 15, 2021
@openjdk
Copy link

openjdk bot commented Nov 15, 2021

@akashche Pushed as commit 24c7fe3.

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

@akashche akashche deleted the 8268294-backport branch November 15, 2021 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant