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

Merge branch 'master' of github.com:twotoasters/RestKit

Browse Source 
Conflicts:
	Code/RKModelLoader.m
This commit is contained in:
Blake Watters
2010-03-11 12:24:19 -05:00
parent 3c5fda2dee 503feec488
commit 2a7377b00e
5 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Code/RKModelLoader.m
View File

@@ -68,7 +68,11 @@
- (void)processLoadModelInBackground:(RKResponse*)response {
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
id model = response.request.userData;
[_mapper mapModel:model fromString:[response payloadString]];
if (model) {
[_mapper mapModel:model fromString:[response payloadString]];
} else {
model = [_mapper mapFromString:[response payloadString]];
}
[_delegate performSelectorOnMainThread:self.callback withObject:model waitUntilDone:NO];
[pool release];
}