Refactoring conditional in responseJSON to avoid unnecessary nil-ing of responseJSON

This commit is contained in:
Mattt Thompson 2013-05-31 11:19:21 -07:00
parent f388740276
commit 9667b21891

View file

@ -70,9 +70,7 @@ static dispatch_queue_t json_request_operation_processing_queue() {
// Workaround for behavior of Rails to return a single space for `head :ok` (a workaround for a bug in Safari), which is not interpreted as valid input by NSJSONSerialization. // Workaround for behavior of Rails to return a single space for `head :ok` (a workaround for a bug in Safari), which is not interpreted as valid input by NSJSONSerialization.
// See https://github.com/rails/rails/issues/1742 // See https://github.com/rails/rails/issues/1742
if ([self.responseData length] == 0 || !self.responseString || [self.responseString isEqualToString:@" "]) { if ([self.responseData length] > 0 && self.responseString && ![self.responseString isEqualToString:@" "]) {
self.responseJSON = nil;
} else {
// Workaround for a bug in NSJSONSerialization when Unicode character escape codes are used instead of the actual character // Workaround for a bug in NSJSONSerialization when Unicode character escape codes are used instead of the actual character
// See http://stackoverflow.com/a/12843465/157142 // See http://stackoverflow.com/a/12843465/157142
NSData *data = [self.responseString dataUsingEncoding:NSUTF8StringEncoding]; NSData *data = [self.responseString dataUsingEncoding:NSUTF8StringEncoding];