Changeset 2938d318 in vaadin

Timestamp:

03/15/12 11:42:10 (14 months ago)

Author:

Artur Signell <artur@…>

Branches:

master, 7.0, 7.1

Children:

6704241d

Parents:

92e7ba65

git-author:

Artur Signell <artur@…> (03/15/12 11:42:10)

git-committer:

Artur Signell <artur@…> (03/15/12 11:42:10)

Message:

Avoid ClassCastException if widget has been previously attached to
another layout that used setLayoutData

File:

• src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java (modified) (1 diff)

src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java

@@ -86 +86 @@
 
     public VLayoutSlot getSlotForChild(Widget widget) {
-        return (VLayoutSlot) widget.getLayoutData();
+        Object o = widget.getLayoutData();
+        if (o instanceof VLayoutSlot) {
+            return (VLayoutSlot) o;
+        }
+
+        return null;
     }