From 26cd9b226d7f934cc901ef80114a88bd6f9fa920 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Wed, 29 Nov 2023 13:44:58 +0200 Subject: [PATCH] Single validateSessionMetadata on WS cmds --- .../server/service/ws/DefaultWebSocketService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java b/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java index 47478b3fdb..895699756a 100644 --- a/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java +++ b/application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java @@ -259,6 +259,8 @@ public class DefaultWebSocketService implements WebSocketService { log.error("[sessionId: {}, tenantId: {}, userId: {}] Failed to handle WS cmd: {}", sessionId, sessionRef.getSecurityCtx().getTenantId(), sessionRef.getSecurityCtx().getId(), cmd, e); } + } else { + return; } } } @@ -850,10 +852,6 @@ public class DefaultWebSocketService implements WebSocketService { return true; } - private boolean validateSessionMetadata(WebSocketSessionRef sessionRef, SubscriptionCmd cmd, String sessionId) { - return validateSessionMetadata(sessionRef, cmd.getCmdId(), sessionId); - } - private boolean validateSessionMetadata(WebSocketSessionRef sessionRef, int cmdId, String sessionId) { WsSessionMetaData sessionMD = wsSessionsMap.get(sessionId); if (sessionMD == null) {