-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade #5030
Merged
lachlan-roberts
merged 7 commits into
jetty-9.4.x
from
jetty-9.4.x-5018-WebSocketClientConnectFuture
Jul 22, 2020
Merged
Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade #5030
lachlan-roberts
merged 7 commits into
jetty-9.4.x
from
jetty-9.4.x-5018-WebSocketClientConnectFuture
Jul 22, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ail upgrade Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
sbordet
requested changes
Jul 13, 2020
...ket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ConnectFutureAbortTest.java
Outdated
Show resolved
Hide resolved
...ket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ConnectFutureAbortTest.java
Outdated
Show resolved
Hide resolved
...ket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ConnectFutureAbortTest.java
Outdated
Show resolved
Hide resolved
...ket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ConnectFutureAbortTest.java
Outdated
Show resolved
Hide resolved
...ket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ConnectFutureAbortTest.java
Outdated
Show resolved
Hide resolved
...ket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ConnectFutureAbortTest.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
…18-WebSocketClientConnectFuture
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
sbordet
requested changes
Jul 15, 2020
...bsocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
sbordet
approved these changes
Jul 15, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Other than the nit in the test class, LGTM.
...ebsocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ConnectFutureTest.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Waiting on PR #5054 to be merged before merging this. |
@lachlan-roberts PR #5054 has been merged. |
lachlan-roberts
deleted the
jetty-9.4.x-5018-WebSocketClientConnectFuture
branch
July 22, 2020 22:36
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #5018
Cancelling the
Future<Session>
fromWebSocketClient.connect()
should cancel the websocket upgrade and close the websocket session if it has already been opened.