From: Johannes Dahlström <johannes.dahlstrom@vaadin.com>
Date: Tue, 22 Nov 2011 13:52:30 +0000 (+0000)
Subject: Fixed potential NullPointerException
X-Git-Tag: 7.0.0.alpha1~225^2~3^2~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7d5095873a588d6427cd6f41087d205f1a9106e5;p=vaadin-framework.git

Fixed potential NullPointerException

svn changeset:22096/svn branch:6.7
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index 5ffe0c640f..8c9fff889d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -1099,9 +1099,9 @@ public class VWindow extends VOverlay implements Container,
      *               the browser to compute it based on the window contents. 
      */
     public void setHeight(String height) {
-        if (!isAttached() || 
-                (height == null && this.height == null) ||
-                height.equals(this.height)) {
+        if (!isAttached() || (height == null 
+                ? this.height == null 
+                : height.equals(this.height))) {
             return;
         }
         if (height == null || "".equals(height)) {