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 03f945dca014927555e72b2afa7bdb103a79b8c3..1d53cf5eb876b98822513b52a96f336138cf95cb 100644 (file)
--- 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);
     }