minor #16686 [DI] use try-finally for container (Tobion)

fabpot · fabpot · commit c9fbff03bc06 · 2015-11-26T19:05:46.000+01:00
This PR was merged into the 3.0-dev branch. Discussion ---------- [DI] use try-finally for container | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Continuation of #15949 Commits ------- 1ab7316 [DI] use try-finally for container
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;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -272,17 +272,13 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE`
`272`	`272`	`try {`
`273`	`273`	`$service = $this->$method();`
`274`	`274`	`} catch (\Exception $e) {`
`275`		`- unset($this->loading[$id]);`
`276`		`-`
`277`		`- if (array_key_exists($id, $this->services)) {`
`278`		`- unset($this->services[$id]);`
`279`		`- }`
	`275`	`+ unset($this->services[$id]);`
`280`	`276`
`281`	`277`	`throw $e;`
	`278`	`+ } finally {`
	`279`	`+ unset($this->loading[$id]);`
`282`	`280`	`}`
`283`	`281`
`284`		`- unset($this->loading[$id]);`
`285`		`-`
`286`	`282`	`return $service;`
`287`	`283`	`}`
`288`	`284`	`}`