From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 15 Jan 2008 10:28:30 +0000 (+0000)
Subject: fixed tabsheet in hosted mode (NPE)
X-Git-Tag: 6.7.0.beta1~5167
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5f5f8ce987763f8a83004620c81f60d408ec798b;p=vaadin-framework.git

fixed tabsheet in hosted mode (NPE)

svn changeset:3508/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
index 9884afe5c4..4a93978981 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -161,13 +161,14 @@ public class ITabsheet extends ITabsheetBase implements
     }
 
     public void setHeight(String height) {
-        if (this.height == null && height == null)
+        if (this.height == null && height == null) {
             return;
+        }
         String oldHeight = this.height;
         this.height = height;
         if ((this.height != null && height == null)
                 || (this.height == null && height != null)
-                || !oldHeight.equals(height)) {
+                || !height.equals(oldHeight)) {
             iLayout();
         }
     }
@@ -183,9 +184,10 @@ public class ITabsheet extends ITabsheetBase implements
         }
         if ((this.width != null && width == null)
                 || (this.width == null && width != null)
-                || !oldWidth.equals(width))
+                || !width.equals(oldWidth)) {
             // Run descendant layout functions
             Util.runDescendentsLayout(this);
+        }
     }
 
     public void iLayout() {