fix NPE on client disconnect to clear client session stats

thingsboard · Oct 29, 2024 · b4b3818 · b4b3818
1 parent b80cd52
commit b4b3818
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.../org/thingsboard/mqtt/broker/service/historical/stats/TbMessageStatsReportClientImpl.java b/.../org/thingsboard/mqtt/broker/service/historical/stats/TbMessageStatsReportClientImpl.java
@@ -25,10 +25,10 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.thingsboard.mqtt.broker.cluster.ServiceInfoProvider;
+import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.mqtt.broker.common.data.kv.LongDataEntry;
 import org.thingsboard.mqtt.broker.common.data.kv.TsKvEntry;
-import org.thingsboard.mqtt.broker.common.data.BrokerConstants;
 import org.thingsboard.mqtt.broker.common.util.DonAsynchron;
 import org.thingsboard.mqtt.broker.dao.timeseries.TimeseriesService;
 import org.thingsboard.mqtt.broker.gen.queue.QueueProtos;
@@ -202,7 +202,9 @@ public void reportClientReceiveStats(String clientId, int qos) {
 
     @Override
     public void removeClient(String clientId) {
-        clientSessionsStats.remove(clientId);
+        if (enabled) {
+            clientSessionsStats.remove(clientId);
+        }
     }
 
     private void reportClientStats(String clientId, String clientStatsKey, String clientQosStatsKey) {