evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:gowalla/AFNetworking

Browse source
This commit is contained in:
Mattt Thompson 2011-10-13 12:57:46 -05:00
commit b811dc1e94
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
AFNetworking/AFJSONRequestOperation.m
View file

@ -116,15 +116,20 @@ static dispatch_queue_t json_request_operation_processing_queue() {
if (!_responseJSON && [self isFinished]) { if (!_responseJSON && [self isFinished]) {
NSError *error = nil; NSError *error = nil;
#if __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_4_3 || __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_6 if ([self.responseData length] == 0) {
if ([NSJSONSerialization class]) { self.responseJSON = nil;
self.responseJSON = [NSJSONSerialization JSONObjectWithData:self.responseData options:0 error:&error];
} else { } else {
self.responseJSON = [[JSONDecoder decoder] objectWithData:self.responseData error:&error];
} #if __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_4_3 || __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_6
if ([NSJSONSerialization class]) {
self.responseJSON = [NSJSONSerialization JSONObjectWithData:self.responseData options:0 error:&error];
} else {
self.responseJSON = [[JSONDecoder decoder] objectWithData:self.responseData error:&error];
}
#else #else
self.responseJSON = [[JSONDecoder decoder] objectWithData:self.responseData error:&error]; self.responseJSON = [[JSONDecoder decoder] objectWithData:self.responseData error:&error];
#endif #endif
}
self.error = error; self.error = error;
} }