From: Marc Englund <marc.englund@itmill.com>
Date: Mon, 10 Mar 2008 09:18:36 +0000 (+0000)
Subject: Don't allow setting the same layout multiple times (caused bug)
X-Git-Tag: 6.7.0.beta1~4955
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=11d54e8ed0fef5178c46987b67d6859ac1caedf8;p=vaadin-framework.git

Don't allow setting the same layout multiple times (caused bug)

svn changeset:4011/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java
index db1f58646f..2084040427 100644
--- a/src/com/itmill/toolkit/ui/Panel.java
+++ b/src/com/itmill/toolkit/ui/Panel.java
@@ -122,6 +122,11 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
             layout.setMargin(true);
         }
 
+        if (layout == this.layout) {
+            // don't set the same layout twice
+            return;
+        }
+
         // Sets the panel to be parent for the layout
         layout.setParent(this);