From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 18 Sep 2009 08:21:24 +0000 (+0000)
Subject: Fix for #3349 - NPE when mainwindow is not set
X-Git-Tag: 6.7.0.beta1~2467^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a9ffbfaaf4c6f842f45b859112648d92eec695a4;p=vaadin-framework.git

Fix for #3349 - NPE when mainwindow is not set

svn changeset:8846/svn branch:6.1
---

diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index df198bc655..ee5a22c3f3 100644
--- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -1087,8 +1087,9 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
         if (window == null) {
             window = application.getMainWindow();
             // Return null if no main window was found
-            if (window == null)
+            if (window == null) {
                 return null;
+            }
         }
 
         // If the requested window is already open, resolve conflict