kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-24 04:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when attempting to union a relationship with a nil value. fixes #1195

Browse Source
This commit is contained in:
Blake Watters
2013-01-28 17:22:33 -05:00
parent 039c7c443d
commit 4840b4b63e
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Code/ObjectMapping/RKMappingOperation.m
View File

@@ -651,7 +651,7 @@ static BOOL RKIsMetadataKVCInvocation(NSInvocation *invocation)
if (relationshipMapping.assignmentPolicy == RKUnionAssignmentPolicy) {
RKLogDebug(@"Mapping relationship with union assignment policy: constructing combined relationship value.");
id existingObjects = [self.destinationObject valueForKeyPath:relationshipMapping.destinationKeyPath];
id existingObjects = [self.destinationObject valueForKeyPath:relationshipMapping.destinationKeyPath] ?: @[];
NSArray *existingObjectsArray = RKTransformedValueWithClass(existingObjects, [NSArray class], nil);
[relationshipCollection addObjectsFromArray:existingObjectsArray];
}

22
Tests/Logic/ObjectMapping/RKObjectMappingNextGenTest.m
View File

@@ -1912,6 +1912,28 @@
assertThat(names, hasItems(@"Jeff", @"Zach", nil));
}
- (void)testUnionAssignmentPolicyWithNilValue
{
RKTestUser *user = [RKTestUser new];
user.friends = nil;
RKObjectMapping *mapping = [RKObjectMapping mappingForClass:[RKTestUser class]];
[mapping addAttributeMappingsFromArray:@[ @"name" ]];
RKRelationshipMapping *relationshipMapping = [RKRelationshipMapping relationshipMappingFromKeyPath:@"friends" toKeyPath:@"friends" withMapping:mapping];
relationshipMapping.assignmentPolicy = RKUnionAssignmentPolicy;
[mapping addPropertyMapping:relationshipMapping];
NSDictionary *dictionary = @{ @"friends": @[ @{ @"name": @"Zach" } ] };
RKMappingOperation *operation = [[RKMappingOperation alloc] initWithSourceObject:dictionary destinationObject:user mapping:mapping];
RKObjectMappingOperationDataSource *dataSource = [RKObjectMappingOperationDataSource new];
operation.dataSource = dataSource;
NSError *error = nil;
[operation performMapping:&error];
expect([user.friends count]).to.equal(1);
NSArray *names = [user.friends valueForKey:@"name"];
assertThat(names, hasItems(@"Zach", nil));
}
- (void)testReplacementPolicyForUnmanagedRelationship
{
RKTestUser *user = [RKTestUser new];