Merge pull request #439 from ParsePlatform/nlutsenko.user.l

Remove potential deadlock from encoding PFUser.

Author: nlutsenko

Parse/PFObject.m

@@ -979,12 +979,12 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
                                 operationSetUUIDs:(NSArray **)operationSetUUIDs
                                             state:(PFObjectState *)state
                                 operationSetQueue:(NSArray *)queue
-                          deletingEventuallyCount:(NSUInteger)deleteingEventuallyCount {
+                          deletingEventuallyCount:(NSUInteger)deletingEventuallyCount {
     NSMutableDictionary *result = [[state dictionaryRepresentationWithObjectEncoder:objectEncoder] mutableCopy];
     result[PFObjectClassNameRESTKey] = state.parseClassName;
     result[PFObjectCompleteRESTKey] = @(state.complete);
 
-    result[PFObjectIsDeletingEventuallyRESTKey] = @(deleteingEventuallyCount);
+    result[PFObjectIsDeletingEventuallyRESTKey] = @(deletingEventuallyCount);
 
     // TODO (hallucinogen): based on some note from Android's toRest, we'll need to put this
     // stuff somewhere else

Parse/PFUser.m

@@ -652,23 +652,21 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
                                             state:(PFObjectState *)state
                                 operationSetQueue:(NSArray *)queue
                           deletingEventuallyCount:(NSUInteger)deletingEventuallyCount {
-    @synchronized (self.lock) {
-        NSMutableArray *cleanQueue = [queue mutableCopy];
-        [queue enumerateObjectsUsingBlock:^(PFOperationSet *operationSet, NSUInteger idx, BOOL *stop) {
-            // Remove operations for `password` field, to not let it persist to LDS.
-            if (operationSet[PFUserPasswordRESTKey]) {
-                operationSet = [operationSet copy];
-                [operationSet removeObjectForKey:PFUserPasswordRESTKey];
-
-                cleanQueue[idx] = operationSet;
-            }
-        }];
-        return [super RESTDictionaryWithObjectEncoder:objectEncoder
-                                    operationSetUUIDs:operationSetUUIDs
-                                                state:state
-                                    operationSetQueue:cleanQueue
-                              deletingEventuallyCount:deletingEventuallyCount];
-    }
+    NSMutableArray *cleanQueue = [queue mutableCopy];
+    [queue enumerateObjectsUsingBlock:^(PFOperationSet *operationSet, NSUInteger idx, BOOL *stop) {
+        // Remove operations for `password` field, to not let it persist to LDS.
+        if (operationSet[PFUserPasswordRESTKey]) {
+            operationSet = [operationSet copy];
+            [operationSet removeObjectForKey:PFUserPasswordRESTKey];
+
+            cleanQueue[idx] = operationSet;
+        }
+    }];
+    return [super RESTDictionaryWithObjectEncoder:objectEncoder
+                                operationSetUUIDs:operationSetUUIDs
+                                            state:state
+                                operationSetQueue:cleanQueue
+                          deletingEventuallyCount:deletingEventuallyCount];
 }
 
 ///--------------------------------------