OpenHAB
/
openhab-addons
mirror of https://github.com/openhab/openhab-addons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mqtt] connectionStateChanged(CONNECTED) called twice (#12200) 

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
pull/12207/head
jimtng 2022-02-05 08:32:56 +10:00 committed by GitHub
parent 97db73938d
commit 73b805b115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java
View File

@ -114,8 +114,6 @@ public abstract class AbstractBrokerHandler extends BaseBridgeHandler implements
}).thenAccept(v -> { }).thenAccept(v -> {
if (!v) { if (!v) {
connectionStateChanged(MqttConnectionState.DISCONNECTED, new TimeoutException("Timeout")); connectionStateChanged(MqttConnectionState.DISCONNECTED, new TimeoutException("Timeout"));
} else {
connectionStateChanged(MqttConnectionState.CONNECTED, null);
} }
}); });
connectionFuture.complete(connection); connectionFuture.complete(connection);

7
bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/BrokerHandler.java
View File

@ -59,19 +59,18 @@ public class BrokerHandler extends AbstractBrokerHandler implements PinnedCallba
@Override @Override
public void connectionStateChanged(MqttConnectionState state, @Nullable Throwable error) { public void connectionStateChanged(MqttConnectionState state, @Nullable Throwable error) {
super.connectionStateChanged(state, error); super.connectionStateChanged(state, error);
// Store generated client ID if none was set by the user
final MqttBrokerConnection connection = this.connection; final MqttBrokerConnection connection = this.connection;
String clientID = config.clientID;
if (connection != null && state == MqttConnectionState.CONNECTED) { if (connection != null && state == MqttConnectionState.CONNECTED) {
String clientID = config.clientID;
if (clientID == null || clientID.isBlank()) { if (clientID == null || clientID.isBlank()) {
// Store generated client ID if none was set by the user
clientID = connection.getClientId(); clientID = connection.getClientId();
config.clientID = clientID; config.clientID = clientID;
Configuration editConfig = editConfiguration(); Configuration editConfig = editConfiguration();
editConfig.put("clientid", clientID); editConfig.put("clientid", clientID);
updateConfiguration(editConfig); updateConfiguration(editConfig);
} else {
publish(config.birthTopic, config.birthMessage, config.birthRetain);
} }
publish(config.birthTopic, config.birthMessage, config.birthRetain);
} }
} }