Skip to content

Fixed assertion messages that were unintentionally changed in #86. #108

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
Aug 26, 2015
Merged

Fixed assertion messages that were unintentionally changed in #86. #108

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
6 changes: 3 additions & 3 deletions Parse/Internal/FieldOperation/PFFieldOperation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ - (PFFieldOperation *)mergeWithPrevious:(PFFieldOperation *)previous {
NSArray *oldArray = (((PFSetOperation *)previous).value);
return [PFSetOperation setWithValue:[self applyToValue:oldArray forKey:nil]];
} else {
[NSException raise:NSInternalInconsistencyException format:@"Operation is invalid after previous operation."];
[NSException raise:NSInternalInconsistencyException format:@"You can't add an item to a non-array."];
return nil;
}
} else if ([previous isKindOfClass:[PFAddUniqueOperation class]]) {
Expand Down Expand Up @@ -336,14 +336,14 @@ - (PFFieldOperation *)mergeWithPrevious:(PFFieldOperation *)previous {
if (!previous) {
return self;
} else if ([previous isKindOfClass:[PFDeleteOperation class]]) {
[NSException raise:NSInternalInconsistencyException format:@"Operation is invalid after previous operation."];
[NSException raise:NSInternalInconsistencyException format:@"You can't remove items from a deleted array."];
return nil;
} else if ([previous isKindOfClass:[PFSetOperation class]]) {
if ([((PFSetOperation *)previous).value isKindOfClass:[NSArray class]]) {
NSArray *oldArray = ((PFSetOperation *)previous).value;
return [PFSetOperation setWithValue:[self applyToValue:oldArray forKey:nil]];
} else {
[NSException raise:NSInternalInconsistencyException format:@"Operation is invalid after previous operation."];
[NSException raise:NSInternalInconsistencyException format:@"You can't add an item to a non-array."];
return nil;
}
} else if ([previous isKindOfClass:[PFRemoveOperation class]]) {
Expand Down