Avoid ClassCastException if widget has been previously attached to

another layout that used setLayoutData

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
index 3c0e9af26d754302ed9065cdd0337920950c42c7..ce317ee563362cc7da5394ba52002325bcc54192 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
@@ -85,7 +85,12 @@ public class VMeasuringOrderedLayout extends ComplexPanel {
     }
 
     public VLayoutSlot getSlotForChild(Widget widget) {
-        return (VLayoutSlot) widget.getLayoutData();
+        Object o = widget.getLayoutData();
+        if (o instanceof VLayoutSlot) {
+            return (VLayoutSlot) o;
+        }
+
+        return null;
     }
 
     public void setCaption(Widget child, VCaption caption) {