Fix unnecessary re-initialization from cache

mpdude · mpdude · commit beb307cbb1da · 2015-04-06T20:18:19.000+02:00
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -367,6 +367,7 @@ protected function initializeCatalogue($locale)
     private function initializeCacheCatalogue($locale)
     {
         if (isset($this->catalogues[$locale])) {
+            /* Catalogue already initialized. */
             return;
         }
 
@@ -376,11 +377,15 @@ private function initializeCacheCatalogue($locale)
         $cache = $this->getConfigCacheFactory()->cache($cacheFile,
             function (ConfigCacheInterface $cache) use ($self, $locale) {
                 $self->dumpCatalogue($locale, $cache);
-
-                return; // $this->catalogues[$locale] is now initialized
             }
         );
 
+        if (isset($this->catalogues[$locale])) {
+            /* Catalogue has been initialized as it was written out to cache. */
+            return;
+        }
+
+        /* Read catalogue from cache. */
         $catalogue = include $cache->getPath();
 
         /*
@@ -408,6 +413,7 @@ function (ConfigCacheInterface $cache) use ($self, $locale) {
             unlink($cacheFile);
             $this->initializeCacheCatalogue($locale);
         } else {
+            /* Initialize with catalogue from cache. */
             $this->catalogues[$locale] = $catalogue;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,7 @@ protected function initializeCatalogue($locale)`
`367`	`367`	`private function initializeCacheCatalogue($locale)`
`368`	`368`	`{`
`369`	`369`	`if (isset($this->catalogues[$locale])) {`
	`370`	`+ /* Catalogue already initialized. */`
`370`	`371`	`return;`
`371`	`372`	`}`
`372`	`373`
`@@ -376,11 +377,15 @@ private function initializeCacheCatalogue($locale)`
`376`	`377`	`$cache = $this->getConfigCacheFactory()->cache($cacheFile,`
`377`	`378`	`function (ConfigCacheInterface $cache) use ($self, $locale) {`
`378`	`379`	`$self->dumpCatalogue($locale, $cache);`
`379`		`-`
`380`		`- return; // $this->catalogues[$locale] is now initialized`
`381`	`380`	`}`
`382`	`381`	`);`
`383`	`382`
	`383`	`+ if (isset($this->catalogues[$locale])) {`
	`384`	`+ /* Catalogue has been initialized as it was written out to cache. */`
	`385`	`+ return;`
	`386`	`+ }`
	`387`	`+`
	`388`	`+ /* Read catalogue from cache. */`
`384`	`389`	`$catalogue = include $cache->getPath();`
`385`	`390`
`386`	`391`	`/*`
`@@ -408,6 +413,7 @@ function (ConfigCacheInterface $cache) use ($self, $locale) {`
`408`	`413`	`unlink($cacheFile);`
`409`	`414`	`$this->initializeCacheCatalogue($locale);`
`410`	`415`	`} else {`
	`416`	`+ /* Initialize with catalogue from cache. */`
`411`	`417`	`$this->catalogues[$locale] = $catalogue;`
`412`	`418`	`}`
`413`	`419`	`}`