From e538af46f27371e8f7e1560f0bdfa2a6e8a4f601 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Fri, 27 Sep 2013 08:59:32 -0700 Subject: [PATCH] Minor refactoring --- AFNetworking/AFURLRequestSerialization.m | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/AFNetworking/AFURLRequestSerialization.m b/AFNetworking/AFURLRequestSerialization.m index 3fad127..289b557 100755 --- a/AFNetworking/AFURLRequestSerialization.m +++ b/AFNetworking/AFURLRequestSerialization.m @@ -284,20 +284,22 @@ NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value) { __block AFStreamingMultipartFormData *formData = [[AFStreamingMultipartFormData alloc] initWithURLRequest:request stringEncoding:NSUTF8StringEncoding]; - [parameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL * __unused stop) { - NSData *data = nil; - if ([obj isKindOfClass:[NSData class]]) { - data = obj; - } else if ([obj isEqual:[NSNull null]]) { - data = [NSData data]; - } else { - data = [[obj description] dataUsingEncoding:NSUTF8StringEncoding]; - } + if (parameters) { + [parameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL * __unused stop) { + NSData *data = nil; + if ([obj isKindOfClass:[NSData class]]) { + data = obj; + } else if ([obj isEqual:[NSNull null]]) { + data = [NSData data]; + } else { + data = [[obj description] dataUsingEncoding:NSUTF8StringEncoding]; + } - if (data) { - [formData appendPartWithFormData:data name:[key description]]; - } - }]; + if (data) { + [formData appendPartWithFormData:data name:[key description]]; + } + }]; + } if (block) { block(formData); @@ -314,14 +316,12 @@ NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value) { { NSParameterAssert(request); - NSMutableURLRequest *mutableRequest = [request mutableCopy]; [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) { [mutableRequest setValue:value forHTTPHeaderField:field]; }]; - if (!parameters) { return mutableRequest; }