From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 25 Feb 2008 11:54:28 +0000 (+0000)
Subject: fixes rather fatal expand layout bug (expanded element reference lost on each removeC... 
X-Git-Tag: 6.7.0.beta1~5024
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e8a685a2e139e9fb7622dc619bcf1fe7a2d5c4d;p=vaadin-framework.git

fixes rather fatal expand layout bug (expanded element reference lost on each removeComponent call)

svn changeset:3914/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/ui/ExpandLayout.java b/src/com/itmill/toolkit/ui/ExpandLayout.java
index 79cc69c1f1..331519f3bb 100644
--- a/src/com/itmill/toolkit/ui/ExpandLayout.java
+++ b/src/com/itmill/toolkit/ui/ExpandLayout.java
@@ -112,10 +112,12 @@ public class ExpandLayout extends OrderedLayout {
 
     public void removeComponent(Component c) {
         super.removeComponent(c);
-        if (c == expanded && getComponentIterator().hasNext()) {
-            expanded = (Component) getComponentIterator().next();
-        } else {
-            expanded = null;
+        if (c == expanded) {
+            if (getComponentIterator().hasNext()) {
+                expanded = (Component) getComponentIterator().next();
+            } else {
+                expanded = null;
+            }
         }
     }