From 058fe12bdcef9fa314cde2e93d942976742c27a4 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 20 May 2009 05:56:37 +0000
Subject: [PATCH] added null check to custom layouts js api cleanup. Fixed some
 customer issues in 5.4 branch

svn changeset:7907/svn branch:6.0
---
 src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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)
-- 
2.39.5