Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #6696 - change method name to WebSocketNegotiation.upgrade() 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2021-09-07 10:19:51 +10:00
parent d41a297352
commit 2aa966a854
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java
View File

@ -54,9 +54,9 @@ public abstract class WebSocketNegotiation
return baseRequest;
}
public void setBaseRequest(Request baseRequest)
public void upgrade()
{
this.baseRequest = baseRequest;
this.baseRequest = null;
}
public HttpServletRequest getRequest()

2
jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
View File

@ -167,7 +167,7 @@ public abstract class AbstractHandshaker implements Handshaker
// Save state from request/response and remove reference to the base request/response.
upgradeRequest.upgrade();
upgradeResponse.upgrade();
negotiation.setBaseRequest(null);
negotiation.upgrade();
if (LOG.isDebugEnabled())
LOG.debug("upgrade connection={} session={} framehandler={}", connection, coreSession, handler);