From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Wed, 25 Nov 2009 09:25:02 +0000 (+0000)
Subject: Fixes #3761: MenuBar breaks the application completely
X-Git-Tag: 6.7.0.beta1~2256
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=58269b3bd071b186c1f6ae367e3326b671e8e4b7;p=vaadin-framework.git

Fixes #3761: MenuBar breaks the application completely

svn changeset:10005/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index 0e09c7a287..1a3d372838 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -756,7 +756,8 @@ public class VMenuBar extends Widget implements Paintable,
     public void iLayout() {
         // Only collapse if there is more than one item in the root menu and the
         // menu has an explicit size
-        if ((getItems().size() > 1 || collapsedRootItems.getItems().size() > 0)
+        if ((getItems().size() > 1 || (collapsedRootItems != null && collapsedRootItems
+                .getItems().size() > 0))
                 && getElement().getStyle().getProperty("width") != null
                 && moreItem != null) {