Remove deleted entities from global instance cache

sprucehealth · Sep 19, 2013 · 2c76698 · 2c76698
1 parent 13a0fb8
commit 2c76698
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/FCModel/FCModel.m b/FCModel/FCModel.m
@@ -137,6 +137,18 @@ - (void)registerUniqueInstance
     dispatch_semaphore_signal(g_instancesReadLock);
 }
 
+- (void)removeUniqueInstance
+{
+    id primaryKeyValue = self.primaryKey;
+    if (! primaryKeyValue || primaryKeyValue == [NSNull null]) return;
+    [self.class uniqueMapInit];
+
+    dispatch_semaphore_wait(g_instancesReadLock, DISPATCH_TIME_FOREVER);
+    NSMapTable *classCache = g_instances[self.class];
+    [classCache removeObjectForKey:primaryKeyValue];
+    dispatch_semaphore_signal(g_instancesReadLock);
+}
+
 + (instancetype)instanceFromDatabaseWithPrimaryKey:(id)key
 {
     __block FCModel *model = NULL;
@@ -646,6 +658,7 @@ - (FCModelSaveResult)delete
     existsInDatabase = NO;
     [self didDelete];
     [NSNotificationCenter.defaultCenter postNotificationName:FCModelDeleteNotification object:self.class userInfo:@{ FCModelInstanceKey : self }];
+    [self removeUniqueInstance];
 
     return FCModelSaveSucceeded;
 }