summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2009-05-20 05:56:37 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2009-05-20 05:56:37 +0000
commit058fe12bdcef9fa314cde2e93d942976742c27a4 (patch)
tree1fa7e35d112daf4577eb30419ac0eaed1ea26128 /src
parentac216768b8caecb7b3ae815c287a82fc55850165 (diff)
downloadvaadin-framework-058fe12bdcef9fa314cde2e93d942976742c27a4.tar.gz
vaadin-framework-058fe12bdcef9fa314cde2e93d942976742c27a4.zip
added null check to custom layouts js api cleanup. Fixed some customer issues in 5.4 branch
svn changeset:7907/svn branch:6.0
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java
index fa4147836f..7cfe627492 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java
@@ -467,7 +467,9 @@ public class VCustomLayout extends ComplexPanel implements Paintable,
@Override
public void onDetach() {
super.onDetach();
- detachResizedFunction(elementWithNativeResizeFunction);
+ if (elementWithNativeResizeFunction != null) {
+ detachResizedFunction(elementWithNativeResizeFunction);
+ }
}
private native void detachResizedFunction(Element element)