diff options
| -rw-r--r-- | client/src/com/vaadin/client/ApplicationConnection.java | 14 |
1 files 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; + + } } } |