Fix lock error, apparently @finally blocks execute after a return

gamma · Jun 24, 2010 · 67ab4fe · 67ab4fe
1 parent 2428b3b
commit 67ab4fe
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/Classes/ASIHTTPRequest.m b/Classes/ASIHTTPRequest.m
@@ -24,7 +24,7 @@
 
 // Automatically set on build
 
-NSString *ASIHTTPRequestVersion = @"v1.6.2-66 2010-06-24";
+NSString *ASIHTTPRequestVersion = @"v1.6.2-67 2010-06-24";
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
@@ -597,15 +597,13 @@ - (void)main
 		if ([self error]) {
 			[self setComplete:YES];
 			[self markAsFinished];
-			[[self cancelledLock] unlock];
 			return;		
 		}
 
 		[self setComplete:NO];
 
 		if (![self url]) {
 			[self failWithError:ASIUnableToCreateRequestError];
-			[[self cancelledLock] unlock];
 			return;		
 		}
 
@@ -628,7 +626,6 @@ - (void)main
 		request = CFHTTPMessageCreateRequest(kCFAllocatorDefault, (CFStringRef)[self requestMethod], (CFURLRef)[self url], [self useHTTPVersionOne] ? kCFHTTPVersion1_0 : kCFHTTPVersion1_1);
 		if (!request) {
 			[self failWithError:ASIUnableToCreateRequestError];
-			[[self cancelledLock] unlock];
 			return;
 		}
 
@@ -648,7 +645,6 @@ - (void)main
 			// See if we should pull from the cache rather than fetching the data
 			if ([self cachePolicy] == ASIOnlyLoadIfNotCachedCachePolicy) {
 				if ([self useDataFromCache]) {
-					[[self cancelledLock] unlock];
 					return;
 				}
 			} else if ([self cachePolicy] == ASIReloadIfDifferentCachePolicy) {
@@ -1501,7 +1497,6 @@ + (void)updateProgressIndicator:(id)indicator withProgress:(unsigned long long)p
 	}
 
 	[progressLock lock];
-
 	[ASIHTTPRequest performSelector:selector onTarget:indicator withObject:nil amount:&progressAmount];
 	[progressLock unlock];
 }