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

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Sep 7, 2021 · 2aa966a · 2aa966a
1 parent d41a297
commit 2aa966a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...re-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java b/...re-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java
@@ -54,9 +54,9 @@ public Request getBaseRequest()
         return baseRequest;
     }
 
-    public void setBaseRequest(Request baseRequest)
+    public void upgrade()
     {
-        this.baseRequest = baseRequest;
+        this.baseRequest = null;
     }
 
     public HttpServletRequest getRequest()

diff --git a/...er/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java b/...er/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
@@ -167,7 +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);
+        negotiation.upgrade();
 
         if (LOG.isDebugEnabled())
             LOG.debug("upgrade connection={} session={} framehandler={}", connection, coreSession, handler);