bug #36460 [Cache] Avoid memory leak in TraceableAdapter::reset() (lyrixx)

fabpot · fabpot · commit 17bbaa502ac3 · 2020-04-17T05:10:57.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Cache] Avoid memory leak in TraceableAdapter::reset() | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | When we call `ServicesResetter::reset()`, we want to reset the application to its initial states. We don't want a memory leak :p Commits ------- 15a8610 [Cache] Avoid memory leak in TraceableAdapter::reset()
diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
@@ -191,15 +191,11 @@ public function prune()
      */
     public function reset()
     {
-        if (!$this->pool instanceof ResettableInterface) {
-            return;
-        }
-        $event = $this->start(__FUNCTION__);
-        try {
+        if ($this->pool instanceof ResettableInterface) {
             $this->pool->reset();
-        } finally {
-            $event->end = microtime(true);
         }
+
+        $this->clearCalls();
     }
 
     public function getCalls()
