Skip to content

Fix a potential deadlock that could occur when encoding for REST. #429

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
Oct 16, 2015
Merged

Fix a potential deadlock that could occur when encoding for REST. #429

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion Parse/Internal/Object/PFObjectPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@
- (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
operationSetUUIDs:(NSArray **)operationSetUUIDs
state:(PFObjectState *)state
operationSetQueue:(NSArray *)operationSetQueue;
operationSetQueue:(NSArray *)queue
deletingEventually:(BOOL)isDeletingEventually;

- (void)mergeFromRESTDictionary:(NSDictionary *)object
withDecoder:(PFDecoder *)decoder;
Expand Down
22 changes: 15 additions & 7 deletions Parse/PFObject.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,25 +958,33 @@ + (BFTask *)_migrateObjectInBackgroundFromFile:(NSString *)fileName
*/
- (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
operationSetUUIDs:(NSArray **)operationSetUUIDs {
NSArray *operationQueue = nil;
PFObjectState *state = nil;
BOOL deleting = NO;
@synchronized (lock) {
[self checkForChangesToMutableContainers];
PFObjectState *state = self._state;
return [self RESTDictionaryWithObjectEncoder:objectEncoder
operationSetUUIDs:operationSetUUIDs
state:state
operationSetQueue:operationSetQueue];
state = self._state;
operationQueue = [[NSArray alloc] initWithArray:operationSetQueue copyItems:YES];
deleting = _deletingEventually;
}

return [self RESTDictionaryWithObjectEncoder:objectEncoder
operationSetUUIDs:operationSetUUIDs
state:state
operationSetQueue:operationQueue
deletingEventually:deleting];
}

- (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
operationSetUUIDs:(NSArray **)operationSetUUIDs
state:(PFObjectState *)state
operationSetQueue:(NSArray *)queue {
operationSetQueue:(NSArray *)queue
deletingEventually:(BOOL)isDeletingEventually {
NSMutableDictionary *result = [[state dictionaryRepresentationWithObjectEncoder:objectEncoder] mutableCopy];
result[PFObjectClassNameRESTKey] = state.parseClassName;
result[PFObjectCompleteRESTKey] = @(state.complete);

result[PFObjectIsDeletingEventuallyRESTKey] = @(_deletingEventually);
result[PFObjectIsDeletingEventuallyRESTKey] = @(isDeletingEventually);

// TODO (hallucinogen): based on some note from Android's toRest, we'll need to put this
// stuff somewhere else
Expand Down
6 changes: 4 additions & 2 deletions Parse/PFUser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,8 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
- (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
operationSetUUIDs:(NSArray **)operationSetUUIDs
state:(PFObjectState *)state
operationSetQueue:(NSArray *)queue {
operationSetQueue:(NSArray *)queue
deletingEventually:(BOOL)isDeletingEventually {
@synchronized (self.lock) {
NSMutableArray *cleanQueue = [queue mutableCopy];
[queue enumerateObjectsUsingBlock:^(PFOperationSet *operationSet, NSUInteger idx, BOOL *stop) {
Expand All @@ -665,7 +666,8 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
return [super RESTDictionaryWithObjectEncoder:objectEncoder
operationSetUUIDs:operationSetUUIDs
state:state
operationSetQueue:cleanQueue];
operationSetQueue:cleanQueue
deletingEventually:isDeletingEventually];
}
}

Expand Down