Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2016-01-12 18:21:43 -0500
committerJoakim Erdfelt2016-01-12 18:21:43 -0500
commita7b3a9f4816b25811a88840b830975b5704fa6fc (patch)
tree517ca540bd78699e934c6f6a79e63b840ba41719
parent57224ec3ca3b07e3fc0689857994c7749173de33 (diff)
downloadorg.eclipse.jetty.project-a7b3a9f4816b25811a88840b830975b5704fa6fc.tar.gz
org.eclipse.jetty.project-a7b3a9f4816b25811a88840b830975b5704fa6fc.tar.xz
org.eclipse.jetty.project-a7b3a9f4816b25811a88840b830975b5704fa6fc.zip
485663 - NullPointerException in WebSocketSession during upgrade with DEBUG logging
+ Defaulting session policy to container policy on session creation
-rw-r--r--jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
index 1a52f59483..e32a52cb91 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
@@ -93,6 +93,7 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Web
this.outgoingHandler = connection;
this.incomingHandler = websocket;
this.connection.getIOState().addListener(this);
+ this.policy = containerScope.getPolicy();
addBean(this.connection);
addBean(this.websocket);

Back to the top