Breaking up the conditionals for clearer test coverage reporting.

sbisbee · Jul 25, 2011 · f8b64c0 · f8b64c0
1 parent 5cf28c9
commit f8b64c0
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/Sag.php b/src/Sag.php
@@ -172,14 +172,21 @@ public function get($url)
       $url = self::setURLParameter($url, 'stale', 'ok');
 
     //Deal with cached items
-    if($this->cache && ($prevResponse = $this->cache->get($url)))
+    if($this->cache)
     {
-      $response = $this->procPacket('GET', $url, null, array('If-None-Match' => $prevResponse->headers->Etag));
+      $prevResponse = $this->cache->get($url);
+
+      if($prevResponse)
+      {
+        $response = $this->procPacket('GET', $url, null, array('If-None-Match' => $prevResponse->headers->Etag));
 
-      if($response->headers->_HTTP->status == 304)
-        return $prevResponse; //cache hit
+        if($response->headers->_HTTP->status == 304)
+          return $prevResponse; //cache hit
 
-      $this->cache->remove($url); 
+        $this->cache->remove($url); 
+      }
+
+      unset($prevResponse);
     }
 
     //Not caching, or we are caching but there's nothing cached yet, or our