From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 16 Aug 2007 09:37:58 +0000 (+0000)
Subject: added null check
X-Git-Tag: 6.7.0.beta1~6099
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0b57c208e72361bf3ef5f06a00e065630ca4fdf1;p=vaadin-framework.git

added null check

svn changeset:2027/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index 830d92deda..d21bb60a29 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -392,9 +392,12 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll
 
 	protected void onDetach() {
 		super.onDetach();
-		if(scrollPositionElement != null)
-			DOM.removeChild(DOM.getParent(scrollPositionElement),
-					scrollPositionElement);
+		//ensure that scrollPosElement will be detached
+		if(scrollPositionElement != null) {
+			Element parent = DOM.getParent(scrollPositionElement);
+			if(parent != null)
+				DOM.removeChild(parent, scrollPositionElement);
+		}
 	}
 
 	/**