From 4b85cc324a74c1306e913b774dc5b41f59b868fe Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 20 Feb 2015 22:48:50 +0200
Subject: [PATCH] Do not restart application if messages are received (#16868)

Change-Id: I5ede5efb7ae9a171fac79f2ead98e2fb12c249c4
---
 .../com/vaadin/client/ApplicationConnection.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index e7bbb65300..8c03f3fdaa 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -62,7 +62,6 @@ import com.google.gwt.user.client.Window.ClosingHandler;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
-import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadListener;
 import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
@@ -1062,8 +1061,17 @@ public class ApplicationConnection implements HasHandlers {
         if (isApplicationRunning()) {
             handleReceivedJSONMessage(start, jsonText, json);
         } else {
-            setApplicationRunning(true);
-            handleWhenCSSLoaded(jsonText, json);
+            if (!cssLoaded) {
+                // Application is starting up for the first time
+                setApplicationRunning(true);
+                handleWhenCSSLoaded(jsonText, json);
+            } else {
+                getLogger()
+                        .warning(
+                                "Ignored received message because application has already been stopped");
+                return;
+
+            }
         }
     }
 
-- 
2.39.5