395232 - UpgradeRequest object passed to createWebSocket() has null Session

+ Server side UpgradeRequest.getSession() now has HttpSession (if
  it has already been created)

1 files changed, 11 insertions, 0 deletions

diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
index 9186c93282..46e021aba6 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
@@ -135,6 +135,17 @@ public class ServletWebSocketRequest extends UpgradeRequest
         return parameters;
     }
 
+    /**
+     * Return the HttpSession if it exists.
+     * <p>
+     * Note: this is equivalent to {@link HttpServletRequest#getSession()} and will not create a new HttpSession.
+     */
+    @Override
+    public Object getSession()
+    {
+        return this.req.getSession();
+    }
+
     protected String[] parseProtocols(String protocol)
     {
         if (protocol == null)