Merge pull request #1221 from OliverLetterer/race-2

[Race] Fixing AFHTTPRequestOperation.HTTPError being overreleased.
This commit is contained in:
Mattt Thompson 2013-08-20 15:13:22 -07:00
commit 7562fce4b9

View file

@ -108,18 +108,38 @@ static void AFSwizzleClassMethodWithClassAndSelectorUsingBlock(Class klass, SEL
#pragma mark -
@interface AFHTTPRequestOperation ()
@property (readwrite, nonatomic, strong) NSRecursiveLock *lock;
@property (readwrite, nonatomic, strong) NSURLRequest *request;
@property (readwrite, nonatomic, strong) NSHTTPURLResponse *response;
@property (readwrite, nonatomic, strong) NSError *HTTPError;
@property (readwrite, strong) NSError *HTTPError;
@end
@implementation AFHTTPRequestOperation
@synthesize HTTPError = _HTTPError;
@synthesize successCallbackQueue = _successCallbackQueue;
@synthesize failureCallbackQueue = _failureCallbackQueue;
@dynamic lock;
@dynamic request;
@dynamic response;
- (NSError *)HTTPError
{
[self.lock lock];
NSError *HTTPError = _HTTPError;
[self.lock unlock];
return HTTPError;
}
- (void)setHTTPError:(NSError *)HTTPError
{
[self.lock lock];
if (HTTPError != _HTTPError) {
_HTTPError = HTTPError;
}
[self.lock unlock];
}
- (void)dealloc {
if (_successCallbackQueue) {
#if !OS_OBJECT_USE_OBJC