Better nil url handling

Olivier Poitrey · Olivier Poitrey · commit 65549dec105f · 2010-06-12T16:37:47.000+02:00
diff --git a/UIImageView+WebCache.m b/UIImageView+WebCache.m
@@ -23,14 +23,12 @@ - (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder
     // Remove in progress downloader from queue
     [manager cancelForDelegate:self];
 
-    if (!url)
+    UIImage *cachedImage = nil;
+    if (url)
     {
-        self.image = nil;
-        return;
+        cachedImage = [manager imageWithURL:url];
     }
 
-    UIImage *cachedImage = [manager imageWithURL:url];
-
     if (cachedImage)
     {
         self.image = cachedImage;
@@ -42,7 +40,10 @@ - (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder
             self.image = placeholder;
         }
 
-        [manager downloadWithURL:url delegate:self];
+        if (url)
+        {
+            [manager downloadWithURL:url delegate:self];
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,12 @@ - (void)setImageWithURL:(NSURL )url placeholderImage:(UIImage )placeholder`
`23`	`23`	`// Remove in progress downloader from queue`
`24`	`24`	`[manager cancelForDelegate:self];`
`25`	`25`
`26`		`- if (!url)`
	`26`	`+ UIImage *cachedImage = nil;`
	`27`	`+ if (url)`
`27`	`28`	`{`
`28`		`- self.image = nil;`
`29`		`- return;`
	`29`	`+ cachedImage = [manager imageWithURL:url];`
`30`	`30`	`}`
`31`	`31`
`32`		`- UIImage *cachedImage = [manager imageWithURL:url];`
`33`		`-`
`34`	`32`	`if (cachedImage)`
`35`	`33`	`{`
`36`	`34`	`self.image = cachedImage;`
`@@ -42,7 +40,10 @@ - (void)setImageWithURL:(NSURL )url placeholderImage:(UIImage )placeholder`
`42`	`40`	`self.image = placeholder;`
`43`	`41`	`}`
`44`	`42`
`45`		`- [manager downloadWithURL:url delegate:self];`
	`43`	`+ if (url)`
	`44`	`+ {`
	`45`	`+ [manager downloadWithURL:url delegate:self];`
	`46`	`+ }`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`