Merge "Fixed absolute layout class cast exception #10155"

1 files changed, 6 insertions, 4 deletions

diff --git a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
index 26ee4409fb..0cfd4fb8e5 100644
--- a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
+++ b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
@@ -80,7 +80,7 @@ public class VAbsoluteLayout extends ComplexPanel {
             wrapper.destroy();
             return super.remove(wrapper);
         }
-        return false;
+        return super.remove(w);
     }
 
     /**
@@ -246,9 +246,11 @@ public class VAbsoluteLayout extends ComplexPanel {
      */
     protected AbsoluteWrapper getChildWrapper(Widget child) {
         for (Widget w : getChildren()) {
-            AbsoluteWrapper wrapper = (AbsoluteWrapper) w;
-            if (wrapper.getWidget() == child) {
-                return wrapper;
+            if (w instanceof AbsoluteWrapper) {
+                AbsoluteWrapper wrapper = (AbsoluteWrapper) w;
+                if (wrapper.getWidget() == child) {
+                    return wrapper;
+                }
             }
         }
         return null;