Skip to content

Fix deadlock on saving an object with a circular reference. #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2015
Merged

Fix deadlock on saving an object with a circular reference. #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions Parse/PFObject.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,12 +377,16 @@ - (BOOL)canBeSerializedAfterSaving:(NSMutableArray *)saved withCurrentUser:(PFUs
// This saves all of the objects and files reachable from the given object.
// It does its work in multiple waves, saving as many as possible in each wave.
// If there's ever an error, it just gives up, sets error, and returns NO;
+ (BFTask *)_deepSaveAsync:(id)object withCurrentUser:(PFUser *)currentUser sessionToken:(NSString *)sessionToken {
BFTask *task = [BFTask taskWithResult:@YES];

+ (BFTask *)_deepSaveAsyncChildrenOfObject:(id)object withCurrentUser:(PFUser *)currentUser sessionToken:(NSString *)sessionToken {
NSMutableSet *uniqueObjects = [NSMutableSet set];
NSMutableSet *uniqueFiles = [NSMutableSet set];
[self collectDirtyChildren:object children:uniqueObjects files:uniqueFiles currentUser:currentUser];
// Remove object from the queue of objects to save as this method should only save children.
if ([object isKindOfClass:[PFObject class]]) {
[uniqueObjects removeObject:object];
}

BFTask *task = [BFTask taskWithResult:@YES];
for (PFFile *file in uniqueFiles) {
task = [task continueAsyncWithSuccessBlock:^id(BFTask *task) {
return [[file saveInBackground] continueAsyncWithBlock:^id(BFTask *task) {
Expand Down Expand Up @@ -622,9 +626,7 @@ + (BFTask *)_enqueueSaveEventuallyChildrenOfObject:(PFObject *)object

- (BFTask *)_saveChildrenInBackgroundWithCurrentUser:(PFUser *)currentUser sessionToken:(NSString *)sessionToken {
@synchronized (lock) {
return [[self class] _deepSaveAsync:_estimatedData.dictionaryRepresentation
withCurrentUser:currentUser
sessionToken:sessionToken];
return [[self class] _deepSaveAsyncChildrenOfObject:self withCurrentUser:currentUser sessionToken:sessionToken];
}
}

Expand Down Expand Up @@ -2345,7 +2347,7 @@ + (BFTask *)saveAllInBackground:(NSArray *)objects {
return [[controller getCurrentObjectAsync] continueWithBlock:^id(BFTask *task) {
PFUser *currentUser = task.result;
NSString *sessionToken = currentUser.sessionToken;
return [PFObject _deepSaveAsync:objects withCurrentUser:currentUser sessionToken:sessionToken];
return [self _deepSaveAsyncChildrenOfObject:objects withCurrentUser:currentUser sessionToken:sessionToken];
}];
}

Expand Down