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

We didn't actually need to hold the lock here, and if we did, another thread could have acquired these locks in another order, causing a deadlock.

Should help to fix #398, #11, and a few others.

Author: richardjrossiii

Parse/Internal/Object/PFObjectPrivate.h

@@ -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;

Parse/PFObject.m

@@ -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

Parse/PFUser.m

@@ -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) {
@@ -665,7 +666,8 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
         return [super RESTDictionaryWithObjectEncoder:objectEncoder
                                     operationSetUUIDs:operationSetUUIDs
                                                 state:state
-                                    operationSetQueue:cleanQueue];
+                                    operationSetQueue:cleanQueue
+                                   deletingEventually:isDeletingEventually];
     }
 }