From dc98a7960a205ce4cd4fa9537ecb1aac7f4f880e Mon Sep 17 00:00:00 2001 From: Mengqi Xu <2663479778@qq.com> Date: Fri, 10 Jan 2025 22:08:45 +0800 Subject: [PATCH] Remove the catch of NPE because this issue had resolved at Jetty 12.0.2. Closes gh-34235 Signed-off-by: Mengqi Xu <2663479778@qq.com> --- .../web/socket/adapter/jetty/JettyWebSocketSession.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java index aa4113345c..9a5e0f1404 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java @@ -183,13 +183,7 @@ public class JettyWebSocketSession extends AbstractWebSocketSession { this.extensions = getExtensions(session); if (this.user == null) { - try { - this.user = session.getUpgradeRequest().getUserPrincipal(); - } - catch (NullPointerException ex) { - // Necessary until https://github.com/eclipse/jetty.project/issues/10498 is resolved - logger.error("Failure from UpgradeRequest while getting Principal", ex); - } + this.user = session.getUpgradeRequest().getUserPrincipal(); } }