[Validator] avoid to get information from the cache when we already have them locally (also fixes usage of this class when not using a cache)

fabpot · fabpot · commit f881d28240eb · 2012-06-15T17:30:46.000+02:00
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
@@ -45,6 +45,10 @@ public function getClassMetadata($class)
     {
         $class = ltrim($class, '\\');
 
+        if (isset($this->loadedClasses[$class])) {
+            return $this->loadedClasses[$class];
+        }
+
         if (null !== $this->cache && false !== ($this->loadedClasses[$class] = $this->cache->read($class))) {
             return $this->loadedClasses[$class];
         }

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ public function getClassMetadata($class)`
`45`	`45`	`{`
`46`	`46`	`$class = ltrim($class, '\\');`
`47`	`47`
	`48`	`+ if (isset($this->loadedClasses[$class])) {`
	`49`	`+ return $this->loadedClasses[$class];`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`if (null !== $this->cache && false !== ($this->loadedClasses[$class] = $this->cache->read($class))) {`
`49`	`53`	`return $this->loadedClasses[$class];`
`50`	`54`	`}`