Merge commit 'e995a038623fe45fb0495450e86cfffbe5639f1d' into temporar…

…y-state-fixes
seatme · May 13, 2012 · 2067142 · 2067142
2 parents fb9f625 + e995a03
commit 2067142
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/AFNetworking/AFHTTPRequestOperation.m b/AFNetworking/AFHTTPRequestOperation.m
@@ -56,30 +56,32 @@ - (id)initWithRequest:(NSURLRequest *)request {
     //by default we will use the queue that created the request.
     self.callbackQueue = dispatch_get_current_queue();
 
+    __weak AFHTTPRequestOperation *weakSelf = self;
     super.completionBlock = ^ {
-        if (_completionBlock) {
-            _completionBlock(); //call any child completion blocks that may have been passed in that they may want to run
+        AFHTTPRequestOperation *strongSelf = weakSelf;
+        if (strongSelf->_completionBlock) {
+            strongSelf->_completionBlock(); //call any child completion blocks that may have been passed in that they may want to run
         }
 
-        if ([self isCancelled]) {
+        if ([strongSelf isCancelled]) {
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
-            [self endBackgroundTask];
+            [strongSelf endBackgroundTask];
 #endif
-            self.finishedBlock = nil;
+            strongSelf.finishedBlock = nil;
             return;
         }
 
-        if (self.finishedBlock) {
-            dispatch_sync(self.callbackQueue, ^(void) {
-                self.finishedBlock();
+        if (strongSelf.finishedBlock) {
+            dispatch_sync(strongSelf.callbackQueue, ^(void) {
+                strongSelf.finishedBlock();
             });
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
-            [self endBackgroundTask];
+            [strongSelf endBackgroundTask];
 #endif
-            self.finishedBlock = nil;
+            strongSelf.finishedBlock = nil;
         } else {
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_4_0
-            [self endBackgroundTask];
+            [strongSelf endBackgroundTask];
 #endif
         }
     };

diff --git a/AFNetworking/AFURLConnectionOperation.m b/AFNetworking/AFURLConnectionOperation.m
@@ -256,8 +256,9 @@ - (void)setCompletionBlock:(void (^)(void))block {
     } else {
         __weak id _blockSelf = self;
         [super setCompletionBlock:^ {
+            id strongSelf = _blockSelf;
             block();
-            [_blockSelf setCompletionBlock:nil];
+            [strongSelf setCompletionBlock:nil];
         }];
     }
 }
@@ -467,8 +468,11 @@ - (NSCachedURLResponse *)connection:(NSURLConnection *)__unused connection
     if ([self isCancelled]) {
         return nil;
     }
-
-    if (self.cacheStoragePolicy == AFURLCacheStorageDefault 
+
+    if (self.cacheStoragePolicy == AFURLCacheStorageNotAllowed) {
+        return nil;
+    }
+    else if (self.cacheStoragePolicy == AFURLCacheStorageDefault 
         || self.cacheStoragePolicy == cachedResponse.storagePolicy) {
         return cachedResponse;
     }