From 53a5d0c8e575c84d253f79b3ac436d4b777f674a Mon Sep 17 00:00:00 2001 From: Zhang Ji <125540670@qq.com> Date: Fri, 24 May 2024 16:44:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=BD=91=E7=BB=9C=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=ADmqtt=E7=BD=91=E5=85=B3?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=20(#512)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/network/mqtt/client/VertxMqttClient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/client/VertxMqttClient.java b/jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/client/VertxMqttClient.java index 47a82a3ac..10d46651b 100755 --- a/jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/client/VertxMqttClient.java +++ b/jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/client/VertxMqttClient.java @@ -116,7 +116,7 @@ public void setClient(io.vertx.mqtt.MqttClient client) { private void reSubscribe() { subscriber .getAllSubscriber() - .filter(topic -> topic.getSubscribers().size() > 0) + .filter(topic -> !topic.getSubscribers().isEmpty()) .collectMap(topic -> getCompleteTopic(convertMqttTopic(topic.getSubscribers().iterator().next().getT1())), topic -> topic.getSubscribers().iterator().next().getT3()) .filter(MapUtils::isNotEmpty) @@ -170,10 +170,10 @@ public Flux subscribe(List topics, int qos) { Tuple3, Integer> topicQos = Tuples.of(topic, sink, qos); - boolean first = sinkTopic.getSubscribers().size() == 0; + boolean first = sinkTopic.getSubscribers().isEmpty(); sinkTopic.subscribe(topicQos); composite.add(() -> { - if (sinkTopic.unsubscribe(topicQos).size() > 0 && isAlive()) { + if (!sinkTopic.unsubscribe(topicQos).isEmpty() && isAlive() && sinkTopic.getSubscribers().isEmpty()) { client.unsubscribe(convertMqttTopic(completeTopic), result -> { if (result.succeeded()) { log.debug("unsubscribe mqtt topic {}", completeTopic);