Merge pull request quarkusio#28268 from yesunch/main

Fix NPE when the subprotocol of websocket is null
gsmet · Sep 29, 2022 · a472f55 · a472f55
2 parents 0e24a41 + 47350db
commit a472f55
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...rc/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLOverWebSocketHandler.java b/...rc/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLOverWebSocketHandler.java
@@ -34,7 +34,12 @@ protected void doHandle(final RoutingContext ctx) {
                 if (event.succeeded()) {
                     ServerWebSocket serverWebSocket = event.result();
                     String subprotocol = serverWebSocket.subProtocol();
-                    GraphQLWebsocketHandler handler = null;
+                    if (subprotocol == null) {
+                        log.warn("Websocket subprotocol is null");
+                        serverWebSocket.close();
+                        return;
+                    }
+                    GraphQLWebsocketHandler handler;
                     switch (subprotocol) {
                         case "graphql-transport-ws":
                             handler = new GraphQLTransportWSSubprotocolHandler(
@@ -49,14 +54,14 @@ protected void doHandle(final RoutingContext ctx) {
                             serverWebSocket.close();
                             return;
                     }
-                    log.debug("Starting websocket with subprotocol = " + subprotocol);
+                    log.debugf("Starting websocket with subprotocol = %s", subprotocol);
                     GraphQLWebsocketHandler finalHandler = handler;
                     serverWebSocket.closeHandler(v -> finalHandler.onClose());
                     serverWebSocket.endHandler(v -> finalHandler.onEnd());
-                    serverWebSocket.exceptionHandler(t -> finalHandler.onThrowable(t));
-                    serverWebSocket.textMessageHandler(m -> finalHandler.onMessage(m));
+                    serverWebSocket.exceptionHandler(finalHandler::onThrowable);
+                    serverWebSocket.textMessageHandler(finalHandler::onMessage);
                 } else {
-                    log.warn("WebSocket failed", event.cause());
+                    log.warn("Websocket failed", event.cause());
                 }
             });
         } else {