From: Artur Signell <artur@vaadin.com>
Date: Sun, 13 May 2012 21:44:42 +0000 (+0300)
Subject: Fixed problem with iterator containing null (#8729)
X-Git-Tag: 7.0.0.alpha3~238
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=97ae8edfab96fd8ca3c670140caae373db30c39e;p=vaadin-framework.git

Fixed problem with iterator containing null (#8729)
---

diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 07dd5a0f69..93b98693c2 100644
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -643,6 +643,10 @@ public abstract class Root extends AbstractComponentContainer implements
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     public Iterator<Component> getComponentIterator() {
+        if (getContent() == null) {
+            return Collections.EMPTY_LIST.iterator();
+        }
+
         return Collections.singleton((Component) getContent()).iterator();
     }