-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Fix incorrect reliance on autoDemand when handlers are not configured #11304
Merged
lorban
merged 3 commits into
jetty-12.0.x
from
fix/12.0.x/11303-incorrect-websocket-autodemand
Jan 24, 2024
Merged
Fix incorrect reliance on autoDemand when handlers are not configured #11304
lorban
merged 3 commits into
jetty-12.0.x
from
fix/12.0.x/11303-incorrect-websocket-autodemand
Jan 24, 2024
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
…figured Signed-off-by: Ludovic Orban <lorban@bitronix.be>
sbordet
requested changes
Jan 23, 2024
...etty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
Outdated
Show resolved
Hide resolved
...ebsocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ExplicitDemandTest.java
Show resolved
Hide resolved
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
sbordet
reviewed
Jan 23, 2024
@@ -149,7 +147,6 @@ public void onWebSocketFrame(Frame frame, Callback callback) | |||
BufferUtil.toUTF8String(frame.getPayload()), | |||
frame.getPayloadLength())); | |||
callback.succeed(); | |||
session.demand(); |
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.
@lachlan-roberts @lorban while currently correct, the removal of this line is not ideal.
If an application wants to handle WebSocket frames directly and only override onWebSocketFrame()
, it has no direct control over the demand.
I opened #11307
sbordet
approved these changes
Jan 23, 2024
lachlan-roberts
approved these changes
Jan 24, 2024
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Fixes #11303.