symfony · nicolas-grekas · Dec 1, 2018 · Nov 29, 2018 · ro0NL · Dec 1, 2018
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -132,19 +132,24 @@ public function dispatch($eventName, Event $event = null)
         }
 
         $this->preProcess($eventName);
-        $this->preDispatch($eventName, $event);
-
-        $e = $this->stopwatch->start($eventName, 'section');
-
-        $this->dispatcher->dispatch($eventName, $event);
-
-        if ($e->isStarted()) {
-            $e->stop();
+        try {
+            $this->preDispatch($eventName, $event);
+            try {
+                $e = $this->stopwatch->start($eventName, 'section');
+                try {
+                    $this->dispatcher->dispatch($eventName, $event);
+                } finally {
+                    if ($e->isStarted()) {
+                        $e->stop();
+                    }
+                }
+            } finally {
+                $this->postDispatch($eventName, $event);
 protected function postDispatch($eventName, Event $event) 
 { 
     switch ($eventName) { 
         case KernelEvents::CONTROLLER_ARGUMENTS: 
             $this->stopwatch->start('controller', 'section'); 
             break; 
         case KernelEvents::RESPONSE: 
             $this->stopwatch->stopSection($token); 
             break; 
         case KernelEvents::TERMINATE: 
             // In the special case described in the `preDispatch` method above, the `$token` section 
             // does not exist, then closing it throws an exception which must be caught. 
             $token = $event->getResponse()->headers->get('X-Debug-Token'); 
             try { 
                 $this->stopwatch->stopSection($token); 
             } catch (\LogicException $e) { 
             } 
             break; 
     } 
 } 
 protected function postDispatch($eventName, Event $event) 
 { 
     switch ($eventName) { 
         case KernelEvents::CONTROLLER_ARGUMENTS: 
             $this->stopwatch->start('controller', 'section'); 
             break; 
         case KernelEvents::RESPONSE: 
             $this->stopwatch->stopSection($token); 
             break; 
         case KernelEvents::TERMINATE: 
             // In the special case described in the `preDispatch` method above, the `$token` section 
             // does not exist, then closing it throws an exception which must be caught. 
             $token = $event->getResponse()->headers->get('X-Debug-Token'); 
             try { 
                 $this->stopwatch->stopSection($token); 
             } catch (\LogicException $e) { 
             } 
             break; 
     } 
 } 
+            }
+        } finally {
+            $this->postProcess($eventName);
         }
 
-        $this->postDispatch($eventName, $event);
-        $this->postProcess($eventName);
-
         return $event;
     }