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

Fix issue with nil arguments to success/failure block introduced earlier today

Browse Source
This commit is contained in:
Blake Watters
2012-10-27 16:41:46 -04:00
parent a3bef1699a
commit e457aba0fa
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Code/Network/RKObjectRequestOperation.m
View File

@@ -185,29 +185,46 @@ static NSString *RKStringDescribingURLResponseWithData(NSURLResponse *response,
}
}
// Adopted fix for "The Deallocation Problem" from AFN
- (void)setCompletionBlock:(void (^)(void))block {
if (!block) {
[super setCompletionBlock:nil];
} else {
__unsafe_unretained id weakSelf = self;
[super setCompletionBlock:^ {
block();
[weakSelf setCompletionBlock:nil];
}];
}
}
- (void)setCompletionBlockWithSuccess:(void (^)(RKObjectRequestOperation *operation, RKMappingResult *mappingResult))success
failure:(void (^)(RKObjectRequestOperation *operation, NSError *error))failure
{
__weak RKObjectRequestOperation *weakSelf = self;
// See above setCompletionBlock:
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Warc-retain-cycles"
self.completionBlock = ^ {
if ([weakSelf isCancelled]) {
if ([self isCancelled]) {
return;
}
if (weakSelf.error) {
if (self.error) {
if (failure) {
dispatch_async(weakSelf.failureCallbackQueue ? weakSelf.failureCallbackQueue : dispatch_get_main_queue(), ^{
failure(weakSelf, weakSelf.error);
NSLog(@"Invoking failure callback with error: %@", self.error);
dispatch_async(self.failureCallbackQueue ? self.failureCallbackQueue : dispatch_get_main_queue(), ^{
failure(self, self.error);
});
}
} else {
if (success) {
dispatch_async(weakSelf.successCallbackQueue ? weakSelf.successCallbackQueue : dispatch_get_main_queue(), ^{
success(weakSelf, weakSelf.mappingResult);
dispatch_async(self.successCallbackQueue ? self.successCallbackQueue : dispatch_get_main_queue(), ^{
success(self, self.mappingResult);
});
}
}
};
#pragma clang diagnostic pop
}
- (RKMappingResult *)performMappingOnResponse:(NSError **)error