From ab5c72f14f206e339d706e4bd16827fd51c83152 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Thu, 16 Dec 2021 14:51:53 +1100 Subject: [PATCH] Fix possible NPEs from WebSocketAdapter Signed-off-by: Lachlan Roberts --- .../org/eclipse/jetty/websocket/api/WebSocketAdapter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java index 04ae3de0b15..2fcaa43e9ff 100644 --- a/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java +++ b/jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java @@ -21,10 +21,11 @@ package org.eclipse.jetty.websocket.api; public class WebSocketAdapter implements WebSocketListener { private volatile Session session; + private RemoteEndpoint remote; public RemoteEndpoint getRemote() { - return session.getRemote(); + return remote; } public Session getSession() @@ -34,7 +35,8 @@ public class WebSocketAdapter implements WebSocketListener public boolean isConnected() { - return session.isOpen(); + Session sess = this.session; + return (sess != null) && (sess.isOpen()); } public boolean isNotConnected() @@ -58,6 +60,7 @@ public class WebSocketAdapter implements WebSocketListener public void onWebSocketConnect(Session sess) { this.session = sess; + this.remote = sess.getRemote(); } @Override