From 1f19e8a3ba1cbab34ee1cdb2ea749ebc29736ec2 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 26 Nov 2007 13:36:48 +0000
Subject: [PATCH] avoid NPE's when ExpandLayout is emptied. Happened very
 easily in TestBench

svn changeset:2966/svn branch:trunk
---
 .../itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java   | 3 +++
 1 file changed, 3 insertions(+)

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);
     }
 
-- 
2.39.5