From 7d5095873a588d6427cd6f41087d205f1a9106e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Dahlstr=C3=B6m?= Date: Tue, 22 Nov 2011 13:52:30 +0000 Subject: [PATCH] Fixed potential NullPointerException svn changeset:22096/svn branch:6.7 --- src/com/vaadin/terminal/gwt/client/ui/VWindow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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)) { -- 2.39.5