From e86fefa709965ccaf67cef371ca2041786161b17 Mon Sep 17 00:00:00 2001 From: chx Date: Mon, 4 Mar 2013 13:57:29 -0800 Subject: [PATCH] Unset loading[$id] in ContainerBuilder on exception --- .../Component/DependencyInjection/ContainerBuilder.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index deb65875ea..71379ef1e8 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -350,7 +350,12 @@ class ContainerBuilder extends Container implements TaggedContainerInterface $this->loading[$id] = true; - $service = $this->createService($definition, $id); + try { + $service = $this->createService($definition, $id); + } catch (\Exception $e) { + unset($this->loading[$id]); + throw $e; + } unset($this->loading[$id]);