fix(mqtt5): keep old reference of connectFuture on reconnect (#1461)

aws-greengrass · May 5, 2023 · f3e5cda · f3e5cda
1 parent 3f52320
commit f3e5cda
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/com/aws/greengrass/mqttclient/AwsIotMqtt5Client.java b/src/main/java/com/aws/greengrass/mqttclient/AwsIotMqtt5Client.java
@@ -292,7 +292,9 @@ private synchronized void internalConnect() {
         if (client != null) {
             return;
         }
-        connectFuture = new CompletableFuture<>();
+        if (connectFuture == null || connectFuture.isDone()) {
+            connectFuture = new CompletableFuture<>();
+        }
         try (AwsIotMqtt5ClientBuilder builder = this.builderProvider.get()) {
             long minReconnectSeconds = Coerce.toLong(mqttTopics.find("minimumReconnectDelaySeconds"));
             long maxReconnectSeconds = Coerce.toLong(mqttTopics.find("maximumReconnectDelaySeconds"));