[Framework] better fix for the previous commit

symfony · Aug 11, 2010 · fca137f · fca137f
1 parent b64e66d
commit fca137f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/Symfony/Framework/ClassCollectionLoader.php b/src/Symfony/Framework/ClassCollectionLoader.php
@@ -18,11 +18,20 @@
  */
 class ClassCollectionLoader
 {
+    static protected $loaded;
+
     /**
      * @throws \InvalidArgumentException When class can't be loaded
      */
     static public function load($classes, $cacheDir, $name, $autoReload)
     {
+        // each $name can only be loaded once per PHP process
+        if (isset(self::$loaded[$name])) {
+            return;
+        }
+
+        self::$loaded[$name] = true;
+
         $classes = array_unique($classes);
 
         $cache = $cacheDir.'/'.$name.'.php';

diff --git a/src/Symfony/Framework/Kernel.php b/src/Symfony/Framework/Kernel.php
@@ -36,8 +36,6 @@
  */
 abstract class Kernel implements HttpKernelInterface, \Serializable
 {
-    static protected $loaded;
-
     protected $bundles;
     protected $bundleDirs;
     protected $container;
@@ -127,17 +125,12 @@ public function boot()
         $this->container = $this->initializeContainer();
 
         // load core classes
-        // can only be loaded once (for all Kernel in the same process)
-        if (!self::$loaded) {
-            self::$loaded = true;
-
-            ClassCollectionLoader::load(
-                $this->container->getParameter('kernel.compiled_classes'),
-                $this->container->getParameter('kernel.cache_dir'),
-                'classes',
-                $this->container->getParameter('kernel.debug')
-            );
-        }
+        ClassCollectionLoader::load(
+            $this->container->getParameter('kernel.compiled_classes'),
+            $this->container->getParameter('kernel.cache_dir'),
+            'classes',
+            $this->container->getParameter('kernel.debug')
+        );
 
         foreach ($this->bundles as $bundle) {
             $bundle->setContainer($this->container);