From 517bb664684754ed83b2392ea7fa04fc45b53df0 Mon Sep 17 00:00:00 2001
From: guilhermeblanco <guilhermeblanco@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 30 Mar 2010 20:25:51 +0000
Subject: [PATCH] [2.0] Implemented single cache lookup in AnnotationReader

---
 .../Common/Annotations/AnnotationReader.php   | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/Doctrine/Common/Annotations/AnnotationReader.php b/lib/Doctrine/Common/Annotations/AnnotationReader.php
index c32e6cabd..9e519884f 100644
--- a/lib/Doctrine/Common/Annotations/AnnotationReader.php
+++ b/lib/Doctrine/Common/Annotations/AnnotationReader.php
@@ -106,10 +106,9 @@ class AnnotationReader
     {
         $cacheKey = $class->getName() . self::$CACHE_SALT;
 
-        //FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they
-        // implement contains() in terms of fetch(), *sigh*.
-        if ($this->_cache->contains($cacheKey)) {
-            return $this->_cache->fetch($cacheKey);
+        // Attempt to grab data from cache
+        if (($data = $this->_cache->fetch($cacheKey)) !== false) {
+            return $data;
         }
         
         $annotations = $this->_parser->parse($class->getDocComment(), "class ".$class->getName());
@@ -143,12 +142,11 @@ class AnnotationReader
     {
         $cacheKey = $property->getDeclaringClass()->getName() . '$' . $property->getName() . self::$CACHE_SALT;
 
-        //FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they
-        // implement contains() in terms of fetch(), *sigh*.
-        if ($this->_cache->contains($cacheKey)) {
-            return $this->_cache->fetch($cacheKey);
+        // Attempt to grab data from cache
+        if (($data = $this->_cache->fetch($cacheKey)) !== false) {
+            return $data;
         }
-
+        
         $context = "property ".$property->getDeclaringClass()->getName()."::\$".$property->getName();
         $annotations = $this->_parser->parse($property->getDocComment(), $context);
         $this->_cache->save($cacheKey, $annotations, null);
@@ -181,10 +179,9 @@ class AnnotationReader
     {
         $cacheKey = $method->getDeclaringClass()->getName() . '#' . $method->getName() . self::$CACHE_SALT;
 
-        //FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they
-        // implement contains() in terms of fetch(), *sigh*.
-        if ($this->_cache->contains($cacheKey)) {
-            return $this->_cache->fetch($cacheKey);
+        // Attempt to grab data from cache
+        if (($data = $this->_cache->fetch($cacheKey)) !== false) {
+            return $data;
         }
 
         $context = "method ".$method->getDeclaringClass()->getName()."::".$method->getName()."()";