Skip to content

Commit d9dc499

Browse files
committed
Make sure we always pass an int for deletingEventuallyCount.
1 parent 03da850 commit d9dc499

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

Parse/Internal/Object/PFObjectPrivate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
operationSetUUIDs:(NSArray **)operationSetUUIDs
222222
state:(PFObjectState *)state
223223
operationSetQueue:(NSArray *)queue
224-
deletingEventually:(BOOL)isDeletingEventually;
224+
deletingEventuallyCount:(NSUInteger)deletingEventuallyCount;
225225

226226
- (void)mergeFromRESTDictionary:(NSDictionary *)object
227227
withDecoder:(PFDecoder *)decoder;

Parse/PFObject.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ @interface PFObject () <PFObjectPrivateSubclass> {
109109
NSMutableSet *_availableKeys; // TODO: (nlutsenko) Maybe decouple this further.
110110

111111
// TODO (grantland): Derive this off the EventuallyPins as opposed to +/- count.
112-
int _deletingEventually;
112+
NSUInteger _deletingEventuallyCount;
113113

114114
// A dictionary that maps id (objects) => PFJSONCache
115115
NSMutableDictionary *hashedObjectsCache;
@@ -960,31 +960,31 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
960960
operationSetUUIDs:(NSArray **)operationSetUUIDs {
961961
NSArray *operationQueue = nil;
962962
PFObjectState *state = nil;
963-
BOOL deleting = NO;
963+
NSUInteger deletingEventuallyCount = 0;
964964
@synchronized (lock) {
965965
[self checkForChangesToMutableContainers];
966966
state = self._state;
967967
operationQueue = [[NSArray alloc] initWithArray:operationSetQueue copyItems:YES];
968-
deleting = _deletingEventually;
968+
deletingEventuallyCount = _deletingEventuallyCount;
969969
}
970970

971971
return [self RESTDictionaryWithObjectEncoder:objectEncoder
972972
operationSetUUIDs:operationSetUUIDs
973973
state:state
974974
operationSetQueue:operationQueue
975-
deletingEventually:deleting];
975+
deletingEventuallyCount:deletingEventuallyCount];
976976
}
977977

978978
- (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
979979
operationSetUUIDs:(NSArray **)operationSetUUIDs
980980
state:(PFObjectState *)state
981981
operationSetQueue:(NSArray *)queue
982-
deletingEventually:(BOOL)isDeletingEventually {
982+
deletingEventuallyCount:(NSUInteger)deleteingEventuallyCount {
983983
NSMutableDictionary *result = [[state dictionaryRepresentationWithObjectEncoder:objectEncoder] mutableCopy];
984984
result[PFObjectClassNameRESTKey] = state.parseClassName;
985985
result[PFObjectCompleteRESTKey] = @(state.complete);
986986

987-
result[PFObjectIsDeletingEventuallyRESTKey] = @(isDeletingEventually);
987+
result[PFObjectIsDeletingEventuallyRESTKey] = @(deleteingEventuallyCount);
988988

989989
// TODO (hallucinogen): based on some note from Android's toRest, we'll need to put this
990990
// stuff somewhere else
@@ -1076,7 +1076,7 @@ - (void)mergeFromRESTDictionary:(NSDictionary *)object withDecoder:(PFDecoder *)
10761076
return;
10771077
}
10781078
if ([key isEqualToString:PFObjectIsDeletingEventuallyRESTKey]) {
1079-
_deletingEventually = [obj intValue];
1079+
_deletingEventuallyCount = [obj unsignedIntegerValue];
10801080
return;
10811081
}
10821082

@@ -2030,7 +2030,7 @@ - (BFTask *)deleteEventually {
20302030
return [self _validateDeleteAsync];
20312031
}] continueWithSuccessBlock:^id(BFTask *task) {
20322032
@synchronized (lock) {
2033-
_deletingEventually += 1;
2033+
_deletingEventuallyCount += 1;
20342034

20352035
PFOfflineStore *store = [Parse _currentManager].offlineStore;
20362036
BFTask *updateDataTask = store ? [store updateDataForObjectAsync:self] : [BFTask taskWithResult:nil];

Parse/PFUser.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
651651
operationSetUUIDs:(NSArray **)operationSetUUIDs
652652
state:(PFObjectState *)state
653653
operationSetQueue:(NSArray *)queue
654-
deletingEventually:(BOOL)isDeletingEventually {
654+
deletingEventuallyCount:(NSUInteger)deletingEventuallyCount {
655655
@synchronized (self.lock) {
656656
NSMutableArray *cleanQueue = [queue mutableCopy];
657657
[queue enumerateObjectsUsingBlock:^(PFOperationSet *operationSet, NSUInteger idx, BOOL *stop) {
@@ -667,7 +667,7 @@ - (NSDictionary *)RESTDictionaryWithObjectEncoder:(PFEncoder *)objectEncoder
667667
operationSetUUIDs:operationSetUUIDs
668668
state:state
669669
operationSetQueue:cleanQueue
670-
deletingEventually:isDeletingEventually];
670+
deletingEventuallyCount:deletingEventuallyCount];
671671
}
672672
}
673673

0 commit comments

Comments
 (0)