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 5ffe0c640f09005e31807f59795edd5841d638be..8c9fff889d51ed48f9334d3d6e7f1d8ddeead29d 100644 (file)
--- 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)) {