summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-11-23 14:25:40 +0200
committerHenri Sara <hesara@vaadin.com>2012-11-23 14:25:40 +0200
commitdf17c6dec3f6ab3111d51db74a32752804a8abad (patch)
tree2c924c52c8864b8dd625df8e573fd936321833c8 /server/src/com/vaadin/ui
parentfa7da722662de5ead99226189ca963afebdf5446 (diff)
downloadvaadin-framework-df17c6dec3f6ab3111d51db74a32752804a8abad.tar.gz
vaadin-framework-df17c6dec3f6ab3111d51db74a32752804a8abad.zip
Fix incorrect null check in PopupView (#10238)
Change-Id: I6a1a3754787f312bbe8fee27588f04d2d6157afe
Diffstat (limited to 'server/src/com/vaadin/ui')
-rw-r--r--server/src/com/vaadin/ui/PopupView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java
index f393de575b..9f43ef193a 100644
--- a/server/src/com/vaadin/ui/PopupView.java
+++ b/server/src/com/vaadin/ui/PopupView.java
@@ -212,7 +212,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
*/
@Override
public Iterator<Component> iterator() {
- if (content != null) {
+ if (visibleComponent != null) {
return Collections.singletonList(visibleComponent).iterator();
} else {
return Collections.<Component> emptyList().iterator();