From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 27 Aug 2009 06:20:36 +0000 (+0000)
Subject: added null checks (without OOPHM dies with new UIDL implementation)
X-Git-Tag: 6.7.0.beta1~2588
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=abaf093054becca1106468f815053583d830e58e;p=vaadin-framework.git

added null checks (without OOPHM dies with new UIDL implementation)

svn changeset:8555/svn branch:6.1
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java
index b473b7f751..d10bcc6cfa 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java
@@ -135,8 +135,12 @@ abstract class VOptionGroupBase extends Composite implements Paintable, Field,
         nullSelectionAllowed = uidl.getBooleanAttribute("nullselect");
         nullSelectionItemAvailable = uidl.getBooleanAttribute("nullselectitem");
 
-        cols = uidl.getIntAttribute("cols");
-        rows = uidl.getIntAttribute("rows");
+        if (uidl.hasAttribute("cols")) {
+            cols = uidl.getIntAttribute("cols");
+        }
+        if (uidl.hasAttribute("rows")) {
+            rows = uidl.getIntAttribute("rows");
+        }
 
         final UIDL ops = uidl.getChildUIDL(0);