diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2011-11-22 13:52:30 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2011-11-22 13:52:30 +0000 |
| commit | 7d5095873a588d6427cd6f41087d205f1a9106e5 (patch) | |
| tree | 276a502f1e12c9d7a5f9eb2b3ec9a5cf0fdd8d3c /src/com | |
| parent | a59af5d4b303476d7d5daf889a0b00881ab31348 (diff) | |
| download | vaadin-framework-7d5095873a588d6427cd6f41087d205f1a9106e5.tar.gz vaadin-framework-7d5095873a588d6427cd6f41087d205f1a9106e5.zip | |
Fixed potential NullPointerException
svn changeset:22096/svn branch:6.7
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VWindow.java | 6 |
1 files 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)) { |