Issue #6696 - don't keep Request object in the WebSocketNegotiation after upgrade #6698
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
…fter upgrade Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
sbordet
requested changes
Sep 6, 2021
| @@ -167,6 +167,7 @@ public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest | |||
| // Save state from request/response and remove reference to the base request/response. | |||
| upgradeRequest.upgrade(); | |||
| upgradeResponse.upgrade(); | |||
| negotiation.setBaseRequest(null); | |||
There was a problem hiding this comment.
The previous 2 lines that call upgrade() actually null-out the references to the request and response, respectively.
I would call the method on WebSocketNegotiation as upgrade() as well, just in case in future we want to null-out some other field, or copy something from the Request object to save it for later use, like the other upgrade() methods do.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
sbordet
approved these changes
Sep 7, 2021
|
@lachlan-roberts please merge |
lachlan-roberts
deleted the
jetty-10.0.x-6696-WebSocketUpgradeRequest
branch
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 #6696
null out the baseRequest field in
WebSocketNegotiationafter the websocket upgrade is complete.