fix(IoT): Fixing a race condition when invalidating/creating the reco…

…nnect timer (#5454)
aws-amplify · Dec 10, 2024 · 582e289 · 582e289
1 parent ce10c22
commit 582e289
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/AWSIoT/Internal/AWSIoTMQTTClient.m b/AWSIoT/Internal/AWSIoTMQTTClient.m
@@ -690,12 +690,19 @@ - (void)cleanupReconnectTimer {
                     waitUntilDone:NO];
             return;
         }
-
-        [self.reconnectTimer invalidate];
-        self.reconnectTimer = nil;
+
+        [self invalidateReconnectTimer];
     }
 }
 
+- (void)invalidateReconnectTimer {
+    __weak AWSIoTMQTTClient *weakSelf = self;
+    dispatch_async(self.timerQueue, ^{
+        [weakSelf.reconnectTimer invalidate];
+        weakSelf.reconnectTimer = nil;
+    });
+}
+
 - (void)cleanUpWebsocketOutputStream {
     @synchronized(self) {
         if (self.websocketOutputStream) {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,10 @@
 
 ## Unreleased
 
--Features for next release
+### Bug Fixes
+
+- **AWSIoT** 
+  - Fixing a race condition when invalidating/creating the reconnect timer (#5454)
 
 ## 2.38.0