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 830d92deda7b15e1b6c5bad3759c85866bc2a457..d21bb60a297bbe2008d2e2c9a29f299ec28ce603 100644 (file)
--- 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);
+               }
        }
 
        /**