From: Anna Koskinen <Ansku@users.noreply.github.com>
Date: Fri, 5 Mar 2021 10:39:09 +0000 (+0200)
Subject: Clear out ClientCache when UI is detached to prevent a minor memory leak (#12220)
X-Git-Tag: 8.12.4~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1f8d79ae6701f21e1a6927e0384fad15c4dfdf8b;p=vaadin-framework.git

Clear out ClientCache when UI is detached to prevent a minor memory leak (#12220)

* Clear out ClientCache when UI is detached to prevent a minor memory leak (#12199)

* Clear out ClientCache when UI is detached to prevent a minor memory leak

Implemented with a listener rather than direct call from UI.detach() in
order to avoid new public API, since the whole feature has been marked
for removal. This doesn't yet prevent the cache or the type map from
getting slightly bloated during the UI's lifetime.

See: #3705
---

diff --git a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
index 5cb90b428a..10ccb7726d 100644
--- a/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
+++ b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
@@ -232,10 +232,25 @@ public class LegacyCommunicationManager implements Serializable {
         if (cache == null) {
             cache = new ClientCache();
             uiToClientCache.put(uiId, cache);
+            uI.addDetachListener(event -> removeClientCache(uI));
         }
         return cache;
     }
 
+    /**
+     * Clear out client cache for the given UI. This should be called when the
+     * UI is detached and the cache becomes obsolete.
+     *
+     * @param uI
+     *            the UI whose client cache should be removed
+     * @deprecated because this cleanup is only needed for a deprecated feature
+     */
+    @Deprecated
+    private void removeClientCache(UI uI) {
+        Integer uiId = Integer.valueOf(uI.getUIId());
+        uiToClientCache.remove(uiId);
+    }
+
     /**
      * Checks if the connector is visible in context. For Components,
      * {@link #isComponentVisibleToClient(Component)} is used. For other types