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

Merge branch 'release/0.10.1' into development

Browse Source
This commit is contained in:
Blake Watters
2012-05-25 23:33:54 -04:00
parent dc47a7aae3 8647fa5f42
commit 014a4dbdff
30 changed files with 1919 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Code/ObjectMapping/RKObjectLoader.m
View File

@@ -123,7 +123,7 @@
- (void)finalizeLoad:(BOOL)successful {
self.loading = NO;
self.loaded = successful;
if ([self.delegate respondsToSelector:@selector(objectLoaderDidFinishLoading:)]) {
[(NSObject<RKObjectLoaderDelegate>*)self.delegate performSelectorOnMainThread:@selector(objectLoaderDidFinishLoading:)
withObject:self waitUntilDone:YES];
@@ -407,7 +407,10 @@
object:self
userInfo:userInfo];
}
[self informDelegateOfError:error];
if (! self.isCancelled) {
[self informDelegateOfError:error];
}
[self finalizeLoad:NO];
}