[DI] use try-finally for container

symfony · Nov 26, 2015 · 1ab7316 · 1ab7316
1 parent 5183c88
commit 1ab7316
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -272,17 +272,13 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             try {
                 $service = $this->$method();
             } catch (\Exception $e) {
-                unset($this->loading[$id]);
-
-                if (array_key_exists($id, $this->services)) {
-                    unset($this->services[$id]);
-                }
+                unset($this->services[$id]);
 
                 throw $e;
+            } finally {
+                unset($this->loading[$id]);
             }
 
-            unset($this->loading[$id]);
-
             return $service;
         }
     }