Wrap encoder recreation in barrier block to avoid race condition

ably · Nov 5, 2021 · 0a7fd0c · 0a7fd0c
1 parent d370c10
commit 0a7fd0c
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Source/ARTChannel.m b/Source/ARTChannel.m
@@ -55,13 +55,15 @@ - (void)setOptions_nosync:(ARTChannelOptions *)options {
 }
 
 - (void)recreateDataEncoderWith:(ARTCipherParams*)cipher {
-    NSError *error = nil;
-    _dataEncoder = [[ARTDataEncoder alloc] initWithCipherParams:cipher error:&error];
-
-    if (error != nil) {
-        [_logger warn:@"creating ARTDataEncoder: %@", error];
-        _dataEncoder = [[ARTDataEncoder alloc] initWithCipherParams:nil error:nil];
-    }
+    dispatch_barrier_async(_queue, ^{
+        NSError *error = nil;
+        self->_dataEncoder = [[ARTDataEncoder alloc] initWithCipherParams:cipher error:&error];
+
+        if (error != nil) {
+            [self->_logger warn:@"creating ARTDataEncoder: %@", error];
+            self->_dataEncoder = [[ARTDataEncoder alloc] initWithCipherParams:nil error:nil];
+        }
+    });
 }
 
 - (void)publish:(NSString *)name data:(id)data {