From 6666a0ee8d61412549f75a965e8a8340894f43b6 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 12 Jul 2010 12:12:38 +0000
Subject: fixes #5340

svn changeset:14175/svn branch:6.4
---
 src/com/vaadin/ui/AbstractComponentContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/vaadin/ui')

diff --git a/src/com/vaadin/ui/AbstractComponentContainer.java b/src/com/vaadin/ui/AbstractComponentContainer.java
index 8df78be328..73093c4123 100644
--- a/src/com/vaadin/ui/AbstractComponentContainer.java
+++ b/src/com/vaadin/ui/AbstractComponentContainer.java
@@ -259,7 +259,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
         if (childrenMayBecomeUndefined) {
             Collection<Component> previouslyInvalidComponents = invalidChildren;
             invalidChildren = getInvalidSizedChildren(vertical);
-            if (previouslyInvalidComponents != null) {
+            if (previouslyInvalidComponents != null && invalidChildren != null) {
                 for (Iterator<Component> iterator = invalidChildren.iterator(); iterator
                         .hasNext();) {
                     Component component = iterator.next();
-- 
cgit v1.2.3