Fix disposing of CancellationTokenSource with registrations.

BoltsFramework · Feb 2, 2016 · 37d6aa8 · 37d6aa8
1 parent beac943
commit 37d6aa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Bolts/Common/BFCancellationToken.m b/Bolts/Common/BFCancellationToken.m
@@ -124,11 +124,9 @@ - (void)dispose {
         if (self.disposed) {
             return;
         }
+        [self.registrations makeObjectsPerformSelector:@selector(dispose)];
+        self.registrations = nil;
         self.disposed = YES;
-        for (BFCancellationTokenRegistration *registration in self.registrations) {
-            [registration dispose];
-        }
-        [self.registrations removeAllObjects];
     }
 }
 

diff --git a/BoltsTests/CancellationTests.m b/BoltsTests/CancellationTests.m
@@ -79,4 +79,12 @@ - (void)testDispose {
     XCTAssertThrowsSpecificNamed(cts.token.cancellationRequested, NSException, NSInternalInconsistencyException);
 }
 
+- (void)testDisposeRegistrationBeforeCancellationToken {
+    BFCancellationTokenSource *cts = [BFCancellationTokenSource cancellationTokenSource];
+    BFCancellationTokenRegistration *registration = [cts.token registerCancellationObserverWithBlock:^{ }];
+
+    [cts dispose];
+    XCTAssertNoThrow([registration dispose]);
+}
+
 @end