From 2647b807f64cc702f0884da908f755ca4a48f892 Mon Sep 17 00:00:00 2001 From: Nikita Mazurenko Date: Wed, 18 Mar 2026 11:16:51 +0200 Subject: [PATCH] Remove shadowing downlinkMessageMapper field in KafkaBasedEdgeGrpcSessionManager --- .../manager/KafkaBasedEdgeGrpcSessionManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java index 186510d5bb..d688f1df4a 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManager.java @@ -35,7 +35,7 @@ import org.thingsboard.server.queue.discovery.TopicService; import org.thingsboard.server.queue.kafka.KafkaAdmin; import org.thingsboard.server.queue.provider.TbCoreQueueFactory; import org.thingsboard.server.queue.util.TbKafkaComponent; -import org.thingsboard.server.service.edge.rpc.DownlinkMessageMapper; + import org.thingsboard.server.service.edge.rpc.EdgeSessionState; import org.thingsboard.server.service.edge.rpc.processor.PostgresGeneralEdgeEventsDispatcher; import org.thingsboard.server.service.edge.rpc.session.EdgeSessionsHolder; @@ -61,7 +61,6 @@ public class KafkaBasedEdgeGrpcSessionManager extends AbstractEdgeGrpcSessionMan private static final int NO_INITIAL_DELAY_VALUE = 0; private final TbCoreQueueFactory tbCoreQueueFactory; - private final DownlinkMessageMapper downlinkMessageMapper; private final TopicService topicService; private final KafkaAdmin kafkaAdmin; private final EdgeSessionsHolder sessions; @@ -252,12 +251,14 @@ public class KafkaBasedEdgeGrpcSessionManager extends AbstractEdgeGrpcSessionMan } private void cancelMigrationAndProcessingInit() { - log.trace("[{}] cancelling edge migration & processing init for edge", getState().getEdgeId()); + EdgeSessionState state = getState(); + log.trace("[{}] cancelling edge migration & processing init for edge", state != null ? state.getEdgeId() : "unknown"); cancelFuture(initMigrationAndProcessingFutureRef); } private void cancelHighPriorityProcessing() { - log.trace("[{}] cancelling high priority processing task for edge", getState().getEdgeId()); + EdgeSessionState state = getState(); + log.trace("[{}] cancelling high priority processing task for edge", state != null ? state.getEdgeId() : "unknown"); cancelFuture(highPriorityProcessingFutureRef); }