From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 26 Nov 2007 13:36:48 +0000 (+0000)
Subject: avoid NPE's when ExpandLayout is emptied. Happened very easily in TestBench
X-Git-Tag: 6.7.0.beta1~5453
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1f19e8a3ba1cbab34ee1cdb2ea749ebc29736ec2;p=vaadin-framework.git

avoid NPE's when ExpandLayout is emptied. Happened very easily in TestBench

svn changeset:2966/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
index 03f945dca0..1d53cf5eb8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
@@ -492,6 +492,9 @@ public class IExpandLayout extends ComplexPanel implements
             remove(c);
         }
         client.unregisterPaintable(p);
+        if (expandedWidget == p) {
+            expandedWidget = null;
+        }
         return remove((Widget) p);
     }