summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2007-08-16 09:37:58 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2007-08-16 09:37:58 +0000
commit0b57c208e72361bf3ef5f06a00e065630ca4fdf1 (patch)
tree3f0c080fb954e22ce5e050cb0b6f8d855fa3a073
parentc29297de779e54bcf7d8faa069bc91cb5f93a64d (diff)
downloadvaadin-framework-0b57c208e72361bf3ef5f06a00e065630ca4fdf1.tar.gz
vaadin-framework-0b57c208e72361bf3ef5f06a00e065630ca4fdf1.zip
added null check
svn changeset:2027/svn branch:trunk
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java9
1 files changed, 6 insertions, 3 deletions
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);
+ }
}
/**