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.

Sign up for GitHub

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

Jump to bottom

Issue #6696 - don't keep Request object in the WebSocketNegotiation after upgrade #6698

Merged
merged 2 commits into from Sep 8, 2021
Merged

Issue #6696 - don't keep Request object in the WebSocketNegotiation after upgrade #6698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d41a297
Issue #6696 - don't keep Request object in the WebSocketNegotiation a…
lachlan-roberts Sep 6, 2021
2aa966a
Issue #6696 - change method name to WebSocketNegotiation.upgrade()
lachlan-roberts Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...re-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java
View file
Open in desktop
Expand Up @@ -31,10 +31,10 @@

public abstract class WebSocketNegotiation
{
private final Request baseRequest;
private final HttpServletRequest request;
private final HttpServletResponse response;
private final WebSocketComponents components;
private Request baseRequest;
private String version;
private List<ExtensionConfig> offeredExtensions;
private List<ExtensionConfig> negotiatedExtensions;
Expand All @@ -54,6 +54,11 @@ public Request getBaseRequest()
return baseRequest;
}

public void upgrade()
{
this.baseRequest = null;
}

public HttpServletRequest getRequest()
{
return request;
Expand Down
1 change: 1 addition & 0 deletions ...er/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
View file
Open in desktop
Expand Up @@ -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.upgrade();

if (LOG.isDebugEnabled())
LOG.debug("upgrade connection={} session={} framehandler={}", connection, coreSession, handler);
Expand Down