Merge pull request #42282 from mkouba/issue-42271

WebSockets Next: CloseReason - fix NPE if connection terminated abruptly
quarkusio · Aug 2, 2024 · 459ea4e · 459ea4e
2 parents 4f347e4 + 983b8bf
commit 459ea4e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/CloseReason.java b/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/CloseReason.java
@@ -50,4 +50,9 @@ public String getMessage() {
         return message;
     }
 
+    @Override
+    public String toString() {
+        return "CloseReason [code=" + code + ", " + (message != null ? "message=" + message : "") + "]";
+    }
+
 }
diff --git a/...ext/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionBase.java b/...ext/runtime/src/main/java/io/quarkus/websockets/next/runtime/WebSocketConnectionBase.java
@@ -131,7 +131,12 @@ public BroadcastSender broadcast() {
     public CloseReason closeReason() {
         WebSocketBase ws = webSocket();
         if (ws.isClosed()) {
-            return new CloseReason(ws.closeStatusCode(), ws.closeReason());
+            Short code = ws.closeStatusCode();
+            if (code == null) {
+                // This could happen if the connection is terminated abruptly
+                return CloseReason.INTERNAL_SERVER_ERROR;
+            }
+            return new CloseReason(code, ws.closeReason());
         }
         return null;
     }