Merge remote-tracking branch 'origin/1.20' into 1.20

This commit is contained in:
zhouhao 2022-05-10 16:53:22 +08:00
commit fc412d652e
1 changed files with 1 additions and 3 deletions

View File

@ -44,8 +44,6 @@ public class MqttClientDeviceGateway extends AbstractDeviceGateway {
private final ProtocolSupports protocolSupport;
private final AtomicBoolean started = new AtomicBoolean();
private Disposable disposable = null;
private final DeviceGatewayHelper helper;
@ -80,7 +78,7 @@ public class MqttClientDeviceGateway extends AbstractDeviceGateway {
}
disposable = mqttClient
.subscribe(topics, qos)
.filter((msg) -> started.get())
.filter((msg) -> isStarted())
.flatMap(mqttMessage -> {
AtomicReference<Duration> timeoutRef = new AtomicReference<>();
return this