From b236969d00c22ab69fe5e77b159ef6428a4cf84d Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Wed, 12 Jul 2023 12:41:59 +0200 Subject: [PATCH] TbWebSocketHandler.SessionMetaData removed synchronization to avoid deadlock with WsSession that already have its own lock --- .../server/controller/plugin/TbWebSocketHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java index 7a396ff795..9cb343dbe3 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java @@ -239,7 +239,7 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements WebSocke this.lastActivityTime = System.currentTimeMillis(); } - synchronized void sendPing(long currentTime) { + void sendPing(long currentTime) { try { long timeSinceLastActivity = currentTime - lastActivityTime; if (timeSinceLastActivity >= pingTimeout) { @@ -262,15 +262,15 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements WebSocke } } - synchronized void processPongMessage(long currentTime) { + void processPongMessage(long currentTime) { lastActivityTime = currentTime; } - synchronized void sendMsg(String msg) { + void sendMsg(String msg) { sendMsg(new TbWebSocketTextMsg(msg)); } - synchronized void sendMsg(TbWebSocketMsg msg) { + void sendMsg(TbWebSocketMsg msg) { if (isSending.compareAndSet(false, true)) { sendMsgInternal(msg); } else {