summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2013-02-01 11:34:05 +0200
committerAnna Koskinen <anna@vaadin.com>2013-02-01 15:26:34 +0200
commit25ac8c743a551034703e8458aae23972102a46f1 (patch)
treec6694aee69088bc67965780e7e86eefdc51abfa9 /client
parent9c6f83505896145c6d84534c610720ede83993e0 (diff)
downloadvaadin-framework-25ac8c743a551034703e8458aae23972102a46f1.tar.gz
vaadin-framework-25ac8c743a551034703e8458aae23972102a46f1.zip
Merge of (#9197) to Vaadin 7.
Fix IE memory leak when closing subwindows. Change-Id: I7205bee96d172e84906aac1456b2523c56302d3b
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VWindow.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java
index 56dc22908e..bd9493c761 100644
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/com/vaadin/client/ui/VWindow.java
@@ -458,6 +458,11 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
private void hideModalityCurtain() {
modalityCurtain.removeFromParent();
+ if (BrowserInfo.get().isIE()) {
+ // IE leaks memory in certain cases unless we release the reference
+ // (#9197)
+ modalityCurtain = null;
+ }
}
/*