From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 22 Oct 2008 12:41:21 +0000 (+0000)
Subject: null check
X-Git-Tag: 6.7.0.beta1~3953
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=261ef91bb7f9ceee08a12d34abb47c6e57ba367c;p=vaadin-framework.git

null check

svn changeset:5695/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
index f4f49041f2..ac7c955e73 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
@@ -426,7 +426,9 @@ public class ChildComponentContainer extends Panel {
             containerDIV.removeChild(caption.getElement());
             caption = null;
         } else {
-            containerDIV.removeChild(widget.getElement());
+            if (widget.isAttached()) {
+                containerDIV.removeChild(widget.getElement());
+            }
             widget = null;
         }