From b337828e96030b0582ae56f85617e7c42fbe555f Mon Sep 17 00:00:00 2001 From: Peyman Date: Mon, 7 Jan 2013 16:03:33 -0800 Subject: [PATCH] Fix race condition in UIImageView+AFNetworking --- AFNetworking/UIImageView+AFNetworking.m | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/AFNetworking/UIImageView+AFNetworking.m b/AFNetworking/UIImageView+AFNetworking.m index f399c0e..91919ca 100644 --- a/AFNetworking/UIImageView+AFNetworking.m +++ b/AFNetworking/UIImageView+AFNetworking.m @@ -119,8 +119,10 @@ static char kAFImageRequestOperationObjectKey; } else { self.image = responseObject; } - - self.af_imageRequestOperation = nil; + + if (self.af_imageRequestOperation == operation) { + self.af_imageRequestOperation = nil; + } } [[[self class] af_sharedImageCache] cacheImage:responseObject forRequest:urlRequest]; @@ -129,13 +131,15 @@ static char kAFImageRequestOperationObjectKey; if (failure) { failure(operation.request, operation.response, error); } - - self.af_imageRequestOperation = nil; + + if (self.af_imageRequestOperation == operation) { + self.af_imageRequestOperation = nil; + } } }]; - + self.af_imageRequestOperation = requestOperation; - + [[[self class] af_sharedImageRequestOperationQueue] addOperation:self.af_imageRequestOperation]; } }